Simplify plugin outlets

Author: nbianca

templates/files/nginx/outlets/http/.gitkeep

@@ -1 +1 @@
-include conf.d/outlets/http/*.conf;
+listen 80;

templates/files/nginx/outlets/http/http.conf

@@ -113,14 +113,14 @@ hooks:
          ACCOUNT_EMAIL=$$ENV_LETSENCRYPT_ACCOUNT_EMAIL
 
     - replace:
-       filename: "/etc/nginx/conf.d/outlets/https/ssl.conf"
+       filename: "/etc/nginx/conf.d/outlets/server/https.conf"
        from: /ssl_certificate.+/
        to: |
          ssl_certificate /shared/ssl/$$ENV_DISCOURSE_HOSTNAME.cer;
          ssl_certificate /shared/ssl/$$ENV_DISCOURSE_HOSTNAME_ecc.cer;
 
     - replace:
-       filename: "/etc/nginx/conf.d/outlets/https/ssl.conf"
+       filename: "/etc/nginx/conf.d/outlets/server/https.conf"
        from: /ssl_certificate_key.+/
        to: |
          ssl_certificate_key /shared/ssl/$$ENV_DISCOURSE_HOSTNAME.key;

templates/files/nginx/outlets/https/.gitkeep

@@ -7,7 +7,7 @@ run:
       path: "/etc/nginx/conf.d/outlets/before-server/redirect-http-to-https.conf"
       contents: |
         server {
-          include conf.d/outlets/http/*.conf;
+          listen 80;
           return 301 https://$$ENV_DISCOURSE_HOSTNAME$request_uri;
         }
 
@@ -16,14 +16,11 @@ run:
       contents: ""
 
   - file:
+      hook: ssl
       path: "/etc/nginx/conf.d/outlets/server/https.conf"
       contents: |
-        include conf.d/outlets/https/*.conf;
+        listen 443 ssl;
 
-  - file:
-      hook: ssl
-      path: "/etc/nginx/conf.d/outlets/https/ssl.conf"
-      contents: |
         ssl_protocols TLSv1.2 TLSv1.3;
         ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
         ssl_prefer_server_ciphers off;
@@ -42,6 +39,14 @@ run:
         }
 
   - file:
-      path: "/etc/nginx/conf.d/outlets/discourse/ssl.conf"
+      path: "/etc/nginx/conf.d/outlets/discourse/https.conf"
       contents: |
         add_header Strict-Transport-Security 'max-age=31536000';
+
+  - exec:
+      cmd:
+        - |-
+          if [ -f "/proc/net/if_inet6" ] ; then
+            sed -i 's/listen 80;/listen 80;\nlisten [::]:80;/g' /etc/nginx/conf.d/outlets/before-server/redirect-http-to-https.conf
+            sed -i 's/listen 443 ssl;/listen 443 ssl;\nlisten [::]:443 ssl;/g' /etc/nginx/conf.d/outlets/https/https.conf
+          fi

templates/files/nginx/outlets/https/https.conf

@@ -151,6 +151,13 @@ run:
       from: /client_max_body_size.+$/
       to: client_max_body_size $upload_size;
 
+  - exec:
+      cmd:
+        - |-
+          if [ -f "/proc/net/if_inet6" ]; then
+            sed -i 's/listen 80;/listen 80;\nlisten [::]:80;/g' /etc/nginx/conf.d/outlets/server/http.conf
+          fi
+
   - exec:
       cmd: echo "done configuring web"
       hook: web_config
@@ -191,6 +198,25 @@ run:
       hook: plugin_compatibility
       raise_on_fail: false
 
+  - exec:
+      cd: $home
+      tag: migrate
+      hook: db_migrate
+      cmd:
+        - su discourse -c 'bundle exec rake db:migrate'
+  - exec:
+      cd: $home
+      tag: build
+      hook: assets_precompile_build
+      cmd:
+        - su discourse -c 'bundle exec rake assets:precompile:build'
+  - exec:
+      cd: $home
+      tag: precompile
+      hook: assets_precompile
+      cmd:
+        - su discourse -c 'SKIP_EMBER_CLI_COMPILE=1 bundle exec rake themes:update assets:precompile'
+
   - replace:
       tag: precompile
       filename: /etc/service/unicorn/run