Add static site single role

ansible/configuration.yml

@@ -10,5 +10,9 @@
     - yatesr.timezone
     - geerlingguy.nginx
     - server
-    - site-anwinged
-    - site-s2photo
+    - role: static-site
+      static_site_name: anwinged
+      static_site_domain: anwinged.ru
+    - role: static-site
+      static_site_name: s2photo
+      static_site_domain: s2photo.ru

ansible/roles/site-anwinged/templates/site.conf.j2

@@ -1,15 +0,0 @@
-server {
-    server_name www.anwinged.ru;
-    return 301 $scheme://anwinged.ru$request_uri;
-}
-
-server {
-    listen 80;
-    server_name anwinged.ru;
-
-    location / {
-        root /var/www/anwinged/current;
-        index index.html;
-        try_files $uri $uri/ =404;
-    }
-}

ansible/roles/site-s2photo/tasks/main.yml

@@ -1,14 +0,0 @@
----
-- name: Create nginx config
-  template:
-    src: site.conf.j2
-    dest: /etc/nginx/sites-enabled/s2photo.conf
-  notify: restart nginx
-
-- name: Create root folder
-  file:
-    path: /var/www/s2photo
-    state: directory
-    owner: deployer
-    group: deployer
-    mode: u=rw,g=r,o=r

ansible/roles/site-s2photo/templates/site.conf.j2

@@ -1,10 +0,0 @@
-server {
-    listen 80;
-    server_name s2photo.ru www.s2photo.ru;
-
-    location / {
-        root /var/www/s2photo/current;
-        index index.html;
-        try_files $uri $uri/ =404;
-    }
-}

ansible/roles/static-site/tasks/main.yml

@@ -2,12 +2,12 @@
 - name: Create nginx config
   template:
     src: site.conf.j2
-    dest: /etc/nginx/sites-enabled/anwinged.conf
+    dest: /etc/nginx/sites-enabled/{{ static_site_name }}.conf
   notify: restart nginx
 
 - name: Create root folder
   file:
-    path: /var/www/anwinged
+    path: /var/www/{{ static_site_name }}
     state: directory
     owner: deployer
     group: www-data

ansible/roles/static-site/templates/site.conf.j2

@@ -0,0 +1,15 @@
+server {
+    server_name www.{{ static_site_domain }};
+    return 301 $scheme://{{ static_site_domain }}$request_uri;
+}
+
+server {
+    listen 80;
+    server_name {{ static_site_domain }};
+
+    location / {
+        root /var/www/{{ static_site_name }}/current;
+        index index.html;
+        try_files $uri $uri/ =404;
+    }
+}