Merge pull request #1419 from IFRCGo/fix/nginx-config-header-not-provided

When HEADER is not provided, mute requests

Author: szabozoltan69

deployments/snapshots/snap_tests.py

@@ -29,12 +29,12 @@
             'programme_type_display': 'Bilateral'
         },
         {
-            'count': 4,
+            'count': 5,
             'programme_type': 1,
             'programme_type_display': 'Multilateral'
         },
         {
-            'count': 3,
+            'count': 2,
             'programme_type': 2,
             'programme_type_display': 'Domestic'
         }
@@ -82,6 +82,11 @@
             'primary_sector': 1,
             'primary_sector_display': 'PGI'
         },
+        {
+            'count': 1,
+            'primary_sector': 2,
+            'primary_sector_display': 'CEA'
+        },
         {
             'count': 3,
             'primary_sector': 3,
@@ -103,7 +108,7 @@
             'primary_sector_display': 'NS Strengthening'
         },
         {
-            'count': 3,
+            'count': 2,
             'primary_sector': 8,
             'primary_sector_display': 'Education'
         },
@@ -310,8 +315,8 @@
             'projects_per_sector': [
                 {
                     'count': 1,
-                    'primary_sector': 8,
-                    'primary_sector_display': 'Education'
+                    'primary_sector': 2,
+                    'primary_sector_display': 'CEA'
                 }
             ],
             'society_name': 'society-name-qJTgrVtaadVUrcYCxAcjpXhdUBtXcCXMFkLAHVklUJGQvVYtjD',

main/nginx.conf

@@ -44,4 +44,10 @@ server {
     }
 }
 
+server {
+    listen 80 443;
+    server_name "";
+    return 444;
+}
+
 # This environment is CHANGE_ME_BEFORE_START.

main/runserver.sh

@@ -9,15 +9,11 @@ python manage.py collectstatic --noinput -l
 python manage.py make_permissions
 
 # Add server name(s) to django settings and nginx - later maybe only nginx would be enough, and ALLOWED_HOSTS could be "*"
-if [ "$API_FQDN"x = goadmin.ifrc.orgx ]; then
-    sed -i 's/\$NGINX_SERVER_NAME/'$API_FQDN' api.go.ifrc.org/g' /etc/nginx/sites-available/nginx.conf
-else
-    sed -i 's/\$NGINX_SERVER_NAME/'$API_FQDN'/g' /etc/nginx/sites-available/nginx.conf
-fi
-# Just a temporary test:
 if [ "$GO_ENVIRONMENT"x = productionx ]; then
+    sed -i 's/\$NGINX_SERVER_NAME/'$API_FQDN' api.go.ifrc.org/g' /etc/nginx/sites-available/nginx.conf
     sed -i 's/CHANGE_ME_BEFORE_START/prod/' /etc/nginx/sites-available/nginx.conf
 else
+    sed -i 's/\$NGINX_SERVER_NAME/'$API_FQDN'/g' /etc/nginx/sites-available/nginx.conf
     sed -i 's/CHANGE_ME_BEFORE_START/'$GO_ENVIRONMENT'/' /etc/nginx/sites-available/nginx.conf
 fi