Replace automatic security upgrade, discourse long poll

webplatform · Jun 8, 2015 · 79a91d6 · 79a91d6
1 parent 5d16ed3
commit 79a91d6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/discourse/files/nginx.frontend.conf.jinja b/discourse/files/nginx.frontend.conf.jinja
@@ -28,16 +28,16 @@ upstream upstream_discourse {
 # host header.
 server {
     listen      80;
-    server_name discuss.{{ tld }};
+    server_name discuss.{{ tld }} discusspolling.{{ tld }};
     include     common_params;
-    return      301 https://discuss.{{ tld }}$request_uri;
+    return      301 https://$server_name$request_uri;
 }
 
 server {
     # Let’s only listen to SSL, Fastly will serve us,
     # and they dont support SPDY/HTTP2
     listen      443 ssl;
-    server_name discuss.{{ tld }};
+    server_name discuss.{{ tld }} discusspolling.{{ tld }};
 
     root    /var/www/html;
     include common_params;

diff --git a/webplatform/init.sls b/webplatform/init.sls
@@ -83,10 +83,23 @@ resolvconf -u:
   cmd.run:
     - unless: grep -q -e 'wpdn' /etc/resolv.conf
 
+
 # ref: http://hardenubuntu.com/initial-setup/system-updates
-/etc/apt/apt.conf.d/20auto-upgrades:
-  file.managed:
-    - source: salt://webplatform/files/20auto-upgrades
+# ref: http://hardenubuntu.com/initial-setup/system-updates
+unattended-upgrades:
+  debconf.set:
+    - data:
+        'unattended-upgrades/enable_auto_updates':
+          type: boolean
+          value: "true"
+  cmd.wait:
+    - name: "dpkg-reconfigure unattended-upgrades"
+    - watch:
+      - debconf: unattended-upgrades
+    - env:
+        DEBIAN_FRONTEND: noninteractive
+        DEBCONF_NONINTERACTIVE_SEEN: "true"
+
 
 /etc/default/irqbalance:
   file.managed: