From c59549b7098a1e928e5d6627a11dfbfd38d27337 Mon Sep 17 00:00:00 2001 From: Alexander Dietrich Date: Wed, 7 Nov 2018 21:53:27 +0100 Subject: [PATCH] Remove website/includes --- .../includes/base-static/handlers/main.yml | 2 -- .../includes/base-static/tasks/main.yml | 36 ------------------- .../includes/base-static/templates/site.j2 | 21 ----------- 3 files changed, 59 deletions(-) delete mode 100644 roles/website/includes/base-static/handlers/main.yml delete mode 100644 roles/website/includes/base-static/tasks/main.yml delete mode 100644 roles/website/includes/base-static/templates/site.j2 diff --git a/roles/website/includes/base-static/handlers/main.yml b/roles/website/includes/base-static/handlers/main.yml deleted file mode 100644 index 90b14cc..0000000 --- a/roles/website/includes/base-static/handlers/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -- include: "{{ playbook_dir }}/roles/nginx/handlers/main.yml" diff --git a/roles/website/includes/base-static/tasks/main.yml b/roles/website/includes/base-static/tasks/main.yml deleted file mode 100644 index 4d07e46..0000000 --- a/roles/website/includes/base-static/tasks/main.yml +++ /dev/null @@ -1,36 +0,0 @@ ---- -- name: configure {{ site }} site - template: > - src=site.j2 - dest=/etc/nginx/sites-available/{{ site }} - owner=root - group=root - mode=0644 - notify: reload nginx - tags: - - nginx - - website - - "{{ site }}" - -- name: create {{ site }} root - file: path={{ document_root.path }} state=directory owner=www-data group=www-data mode=0755 - when: document_root.create - tags: - - nginx - - website - - "{{ site }}" - -- name: enable {{ site }} site - file: > - src=/etc/nginx/sites-available/{{ site }} - dest=/etc/nginx/sites-enabled/{{ site }} - owner=root - group=root - mode=0644 - state=link - notify: reload nginx - tags: - - nginx - - website - - "{{ site }}" - diff --git a/roles/website/includes/base-static/templates/site.j2 b/roles/website/includes/base-static/templates/site.j2 deleted file mode 100644 index 9d9d83a..0000000 --- a/roles/website/includes/base-static/templates/site.j2 +++ /dev/null @@ -1,21 +0,0 @@ -{% for port in ports %} -server { - include /etc/nginx/include/no_logging.conf; - include /etc/nginx/include/no_dotfiles.conf; - include /etc/nginx/include/no_symlinks.conf; - -{% if listing %} - location / { - include /etc/nginx/include/listing.conf; - } - -{% endif %} - listen {{port.number}}{% if port.ssl %} ssl{% endif %}; - listen [::]:{{port.number}}{% if port.ssl %} ssl{% endif %}; - - server_name {{ domains | join(" ") }}; - - root {{ document_root.path }}; -} - -{% endfor %}