From f34cb60eb8120cfc26fc8ba97bc11c84067bb623 Mon Sep 17 00:00:00 2001
From: Adrien Luxey <adrien.luxey@gmail.com>
Date: Tue, 28 Jan 2020 01:24:25 +0100
Subject: [PATCH] nginx template seems to work

---
 wordpress/ansible-playbook.yml             |  6 ++-
 wordpress/lexperimental/docker-compose.yml |  4 ++
 wordpress/lexperimental/lexperimental.fr   | 44 ++++++++++++++++++++++
 wordpress/templates/docker-compose.yml.j2  |  4 ++
 wordpress/templates/nginx-site.conf.j2     | 44 ++++++++++++++++++++++
 5 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 wordpress/lexperimental/lexperimental.fr
 create mode 100644 wordpress/templates/nginx-site.conf.j2

diff --git a/wordpress/ansible-playbook.yml b/wordpress/ansible-playbook.yml
index abf0a36..501c9a1 100644
--- a/wordpress/ansible-playbook.yml
+++ b/wordpress/ansible-playbook.yml
@@ -29,10 +29,14 @@
       template:
         src: templates/docker-compose.yml.j2
         dest: "{{ site_name }}/docker-compose.yml"
+    - name: Generate a nginx config file for our site
+      template:
+        src: templates/nginx-site.conf.j2
+        dest: "{{ site_name }}/{{ site_url }}"
   # - debug: "Do the MySQL users thingy"
       #- name: Generate a new nginx server config file
       #- template:
-      #-   src: templates/site.conf.j2
+      #-   src: templates/nginx-site.conf.j2
       #-   dest: "/etc/nginx/sites-available/{{ site_url }}"
       #  become: yes
   # - debug: "Now do `ln -s /etc/nginx/sites-available/{{ site_url }} /etc/nginx/sites-enabled/"
diff --git a/wordpress/lexperimental/docker-compose.yml b/wordpress/lexperimental/docker-compose.yml
index 7218bbd..756ad7c 100644
--- a/wordpress/lexperimental/docker-compose.yml
+++ b/wordpress/lexperimental/docker-compose.yml
@@ -1,5 +1,9 @@
 version: '3'
 
+
+# Generated by ansible for site lexperimental.fr 
+# At 172.100.0.2 on 172.100.0.0/24
+
 services:
   wp:
     image: wordpress:apache
diff --git a/wordpress/lexperimental/lexperimental.fr b/wordpress/lexperimental/lexperimental.fr
new file mode 100644
index 0000000..0af3cde
--- /dev/null
+++ b/wordpress/lexperimental/lexperimental.fr
@@ -0,0 +1,44 @@
+# Generated by ansible for site lexperimental.fr 
+# At 172.100.0.2 on 172.100.0.0/24
+
+server {
+  listen 80;
+  listen [::]:80;
+  server_name lexperimental.fr www.lexperimental.fr;
+
+  rewrite ^ https://lexperimental.fr$request_uri permanent;
+}
+
+server {
+  listen 443 ssl;
+  listen [::]:443 ssl;
+  server_name lexperimental.fr www.lexperimental.fr;
+
+  access_log  /var/log/nginx/lexperimental-access.log;
+  error_log   /var/log/nginx/error.log;
+
+  # Let's Encrypt
+  include snippets/letsencrypt.conf;
+
+  include snippets/ssl-params.conf;
+  ssl_certificate /etc/letsencrypt/live/lexperimental.fr/fullchain.pem;
+  ssl_certificate_key /etc/letsencrypt/live/lexperimental.fr/privkey.pem;
+
+  if ($host = www.lexperimental.fr) {
+    rewrite ^ https://lexperimental.fr$request_uri permanent;
+  }
+
+  # Run by host
+  # root /var/www/lexperimental;
+  # include snippets/wordpress.conf;
+  
+  # Run in Docker
+  include snippets/header-params_server.conf;
+  location / {
+    include snippets/header-params_location.conf;
+  
+    proxy_pass http://172.100.0.2:80;
+  }
+}
+
+
diff --git a/wordpress/templates/docker-compose.yml.j2 b/wordpress/templates/docker-compose.yml.j2
index 9870a79..283eddd 100644
--- a/wordpress/templates/docker-compose.yml.j2
+++ b/wordpress/templates/docker-compose.yml.j2
@@ -1,5 +1,9 @@
 version: '3'
 
+
+# Generated by ansible for site {{ site_url }} 
+# At {{ subnet_site_ip }} on {{ subnet_cidr_address }}
+
 services:
   wp:
     image: {{ docker_image }}
diff --git a/wordpress/templates/nginx-site.conf.j2 b/wordpress/templates/nginx-site.conf.j2
new file mode 100644
index 0000000..6762cb1
--- /dev/null
+++ b/wordpress/templates/nginx-site.conf.j2
@@ -0,0 +1,44 @@
+# Generated by ansible for site {{ site_url }} 
+# At {{ subnet_site_ip }} on {{ subnet_cidr_address }}
+
+server {
+  listen 80;
+  listen [::]:80;
+  server_name {{ site_url }} www.{{ site_url }};
+
+  rewrite ^ https://{{ site_url }}$request_uri permanent;
+}
+
+server {
+  listen 443 ssl;
+  listen [::]:443 ssl;
+  server_name {{ site_url }} www.{{ site_url }};
+
+  access_log  /var/log/nginx/{{ site_name }}-access.log;
+  error_log   /var/log/nginx/error.log;
+
+  # Let's Encrypt
+  include snippets/letsencrypt.conf;
+
+  include snippets/ssl-params.conf;
+  ssl_certificate /etc/letsencrypt/live/{{ site_url }}/fullchain.pem;
+  ssl_certificate_key /etc/letsencrypt/live/{{ site_url }}/privkey.pem;
+
+  if ($host = www.{{ site_url }}) {
+    rewrite ^ https://{{ site_url }}$request_uri permanent;
+  }
+
+  # Run by host
+  # root /var/www/{{ site_name }};
+  # include snippets/wordpress.conf;
+  
+  # Run in Docker
+  include snippets/header-params_server.conf;
+  location / {
+    include snippets/header-params_location.conf;
+  
+    proxy_pass http://{{ subnet_site_ip }}:80;
+  }
+}
+
+