Update sponson install file

deployment/sponson/gunicorn.py

@@ -5,7 +5,7 @@
 # Don't include the PID file path here
 # as it is setup in the systemd file.
 
-bind = "127.0.0.1:8008"
+bind = "127.0.0.1:5000"
 workers = 1
 worker_class = "eventlet"
 daemon = False

deployment/sponson/nginx.conf

@@ -8,20 +8,20 @@ events {
 }
 
 http {
-    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
+    log_format main '$remote_addr - $remote_user [$time_local] "$request" '
+                    '$status $body_bytes_sent "$http_referer" '
+                    '"$http_user_agent" "$http_x_forwarded_for"';
 
-    access_log  syslog:server=unix:/dev/log  main;
+    access_log syslog:server=unix:/dev/log  main;
 
-    sendfile            on;
-    tcp_nopush          on;
-    tcp_nodelay         on;
-    keepalive_timeout   65;
+    sendfile on;
+    tcp_nopush on;
+    tcp_nodelay on;
+    keepalive_timeout 65;
     types_hash_max_size 2048;
 
-    include             /etc/nginx/mime.types;
-    default_type        application/octet-stream;
+    include /etc/nginx/mime.types;
+    default_type application/octet-stream;
 
     # Load modular configuration files from the /etc/nginx/conf.d directory.
     # See http://nginx.org/en/docs/ngx_core_module.html#include
@@ -29,16 +29,17 @@ http {
     include /etc/nginx/conf.d/*.conf;
 
     upstream app_server {
-      server 127.0.0.1:8008 fail_timeout=0;
+      server 127.0.0.1:5000 fail_timeout=0;
     }
 
     map $http_upgrade $connection_upgrade {
       default upgrade;
-      ''      close;
+      '' close;
     }
 
     server {
       listen 80;
+      listen [::]:80
       server_name vowel.lapwing.org;
 
       client_max_body_size 4G;
@@ -56,7 +57,6 @@ http {
 
           proxy_redirect off;
 
-          proxy_set_header X-Real-IP $remote_addr;
           proxy_set_header Host $host;
           proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
@@ -70,7 +70,6 @@ http {
 
         proxy_redirect off;
 
-        proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header Host $host;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
       }

deployment/sponson/rq_settings.conf

@@ -6,5 +6,5 @@
 # copy it to the instance directory
 # and edit it there.
 
-RQ_REDIS_URL="redis://redis.sponson.lan:6379/1"
+RQ_REDIS_URL="redis://redis:6379/1"
 SENTRY_DSN=""

vowel.yaml

@@ -1,9 +1,19 @@
 image:
-  name: lapwing.org/fedora23/vowel
-  version: 0.2.0
-  srcimage: lapwing.org/fedora23/flask
+  name: lapwing.org/fedora25/vowel
+  version: 0.2.0.20170322
+  srcimage:
+    name: lapwing.org/fedora25/nginx
+    version: v20170310
   build:
     - dnf:
+        releasever: 25
+        repo:
+            "*":
+              enabled: False
+            fedora:
+              enabled: True
+            updates:
+              enabled: True
         pkglist:
           - python3-lxml
           - libreoffice-impress