diff --git a/dl.yml b/dl.yml new file mode 100644 index 0000000..4abab46 --- /dev/null +++ b/dl.yml @@ -0,0 +1,59 @@ +--- + +- hosts: dl + tasks: + - name: Basic setup + include_role: name=common + + - name: Install nginx fancyindex + apt: + name: libnginx-mod-http-fancyindex + state: present + + - name: Setup afpy.org + include_role: name=julienpalard.nginx + vars: + nginx_owner: dl-afpy-org + nginx_domain: dl.afpy.org + nginx_certificates: [dl.afpy.org, videos-2015.pycon.fr] + nginx_conf: | + server + { + listen 80; + server_name dl.afpy.org videos-2015.pycon.fr; + access_log /var/log/nginx/http-access.log; + error_log /var/log/nginx/http-error.log; + return 301 https://$host$request_uri; + } + + server + { + listen 443 ssl; + server_name dl.afpy.org; + access_log /var/log/nginx/dl.afpy.org-access.log; + error_log /var/log/nginx/dl.afpy.org-error.log; + include snippets/letsencrypt-dl.afpy.org.conf; + + root /var/www/dl.afpy.org/; + + location / + { + fancyindex on; + } + } + + server + { + listen 443 ssl; + server_name videos-2015.pycon.fr; + access_log /var/log/nginx/videos-2015.pycon.fr-access.log; + error_log /var/log/nginx/videos-2015.pycon.fr-error.log; + include snippets/letsencrypt-dl.afpy.org.conf; + + root /var/www/videos-2015.pycon.fr/; + + location / + { + index index.html; + } + } diff --git a/inventory b/inventory index 93dd122..77028b0 100644 --- a/inventory +++ b/inventory @@ -1,6 +1,9 @@ [webservers] deb.afpy.org +[dl] +dl.afpy.org + [rsnapshoters] silence.local # Yes it's on Julien's LAN. diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index cace167..d64ade4 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -31,21 +31,10 @@ mode: 0755 notify: reload nftables - - name: Remove /etc/apt/sources.list (May contain cdroms…) - file: - path: /etc/apt/sources.list - state: absent - - - name: Setup apt source list for buster - copy: - dest: /etc/apt/sources.list.d/debian.list - content: | - deb https://deb.debian.org/debian buster main non-free contrib - deb http://security.debian.org/debian-security buster/updates main contrib non-free - deb https://deb.debian.org/debian buster-updates main - - - name: Update via apt - apt: update_cache=yes + - name: Update via apt (mandatory on first run) + apt: + update_cache: yes + cache_valid_time: 86400 - name: Install some usefull packages apt: