Merge branch 'master' into feature/user_search

Schulddossier · Feb 5, 2021 · f3ec6cf · f3ec6cf
2 parents 37dbb71 + 5badbff
commit f3ec6cf
Show file tree

Hide file tree

Showing 4 changed files with 223 additions and 9 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -47,7 +47,7 @@ node {
 
 String BRANCH = "${env.BRANCH_NAME}"
 
-if (BRANCH == "dpsecure" || BRANCH == "feature/user_search") {
+if (BRANCH == "master" || BRANCH == "dpsecure" || BRANCH == "feature/user_search") {
 
     node {
         stage('Push acceptance image') {
@@ -64,10 +64,11 @@ if (BRANCH == "dpsecure" || BRANCH == "feature/user_search") {
         stage("Deploy to ACC") {
             tryStep "deployment", {
                 build job: 'Subtask_Openstack_Playbook',
-                        parameters: [
-                                [$class: 'StringParameterValue', name: 'INVENTORY', value: 'acceptance'],
-                                [$class: 'StringParameterValue', name: 'PLAYBOOK', value: 'deploy-schuldhulp.yml'],
-                        ]
+                    parameters: [
+                        [$class: 'StringParameterValue', name: 'INVENTORY', value: 'acceptance'],
+                        [$class: 'StringParameterValue', name: 'PLAYBOOK', value: 'deploy.yml'],
+                        [$class: 'StringParameterValue', name: 'PLAYBOOKPARAMS', value: "-e cmdb_id=app_schuldhulp"]
+                    ]
             }
         }
     }
@@ -92,10 +93,11 @@ if (BRANCH == "dpsecure" || BRANCH == "feature/user_search") {
         stage("Deploy") {
             tryStep "deployment", {
                 build job: 'Subtask_Openstack_Playbook',
-                        parameters: [
-                                [$class: 'StringParameterValue', name: 'INVENTORY', value: 'production'],
-                                [$class: 'StringParameterValue', name: 'PLAYBOOK', value: 'deploy-schuldhulp.yml'],
-                        ]
+                    parameters: [
+                        [$class: 'StringParameterValue', name: 'INVENTORY', value: 'production'],
+                        [$class: 'StringParameterValue', name: 'PLAYBOOK', value: 'deploy.yml'],
+                        [$class: 'StringParameterValue', name: 'PLAYBOOKPARAMS', value: "-e cmdb_id=app_schuldhulp"]
+                    ]
             }
         }
     }

diff --git a/docker/nginx/vhost-acceptance.conf b/docker/nginx/vhost-acceptance.conf
@@ -0,0 +1,72 @@
+server {
+    server_name _;
+    listen 0.0.0.0:80;
+    root /srv/app/public;
+
+    add_header Access-Control-Allow-Origin https://acc.schulddossier.amsterdam.nl;
+
+    location / {
+        try_files $uri /index.php$is_args$args;
+    }
+
+    location ~ ^/index\.php(/|$) {
+        fastcgi_pass 127.0.0.1:9000;
+        fastcgi_split_path_info ^(.+\.php)(/.*)$;
+        include fastcgi_params;
+
+        fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
+        fastcgi_param DOCUMENT_ROOT $realpath_root;
+        internal;
+    }
+
+    location ~ \.php$ {
+        return 404;
+    }
+
+    error_log /srv/app/var/log/nginx-schulddossier_error.log;
+    access_log /srv/app/var/log/nginx-schulddossier_access.log;
+}
+
+server {
+    server_name _;
+
+    listen 443 ssl http2;
+    listen [::]:443 ssl http2;
+
+    root /srv/app/public;
+
+    add_header Access-Control-Allow-Origin https://acc.schulddossier.amsterdam.nl;
+
+    ssl on;
+
+    ssl_certificate /srv/localhost.crt;
+    ssl_certificate_key /srv/localhost.key;
+
+    ssl_session_timeout 1d;
+    ssl_session_cache shared:SSL:50m;
+    ssl_session_tickets off;
+    ssl_protocols TLSv1.2;
+    ssl_ciphers 'ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256';
+    ssl_prefer_server_ciphers on;
+
+    location / {
+        try_files $uri /index.php$is_args$args;
+    }
+
+    location ~ ^/index\.php(/|$) {
+        fastcgi_pass 127.0.0.1:9000;
+        fastcgi_split_path_info ^(.+\.php)(/.*)$;
+        include fastcgi_params;
+
+        fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
+        fastcgi_param DOCUMENT_ROOT $realpath_root;
+        internal;
+    }
+
+    location ~ \.php$ {
+      return 404;
+    }
+
+    error_log /srv/app/var/log/nginx-schulddossier_error.log;
+    access_log /srv/app/var/log/nginx-schulddossier_access.log;
+}
diff --git a/docker/nginx/vhost-dev.conf b/docker/nginx/vhost-dev.conf
@@ -0,0 +1,68 @@
+server {
+    server_name _;
+    listen 0.0.0.0:80;
+    root /srv/app/public;
+
+    location / {
+        try_files $uri /index.php$is_args$args;
+    }
+
+    location ~ ^/index\.php(/|$) {
+        fastcgi_pass 127.0.0.1:9000;
+        fastcgi_split_path_info ^(.+\.php)(/.*)$;
+        include fastcgi_params;
+
+        fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
+        fastcgi_param DOCUMENT_ROOT $realpath_root;
+        internal;
+    }
+
+    location ~ \.php$ {
+        return 404;
+    }
+
+    error_log /srv/app/var/log/nginx-schulddossier_error.log;
+    access_log /srv/app/var/log/nginx-schulddossier_access.log;
+}
+
+server {
+    server_name _;
+
+    listen 443 ssl http2;
+    listen [::]:443 ssl http2;
+
+    root /srv/app/public;
+
+    ssl on;
+
+    ssl_certificate /srv/localhost.crt;
+    ssl_certificate_key /srv/localhost.key;
+
+    ssl_session_timeout 1d;
+    ssl_session_cache shared:SSL:50m;
+    ssl_session_tickets off;
+    ssl_protocols TLSv1.2;
+    ssl_ciphers 'ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256';
+    ssl_prefer_server_ciphers on;
+
+    location / {
+        try_files $uri /index.php$is_args$args;
+    }
+
+    location ~ ^/index\.php(/|$) {
+        fastcgi_pass 127.0.0.1:9000;
+        fastcgi_split_path_info ^(.+\.php)(/.*)$;
+        include fastcgi_params;
+
+        fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
+        fastcgi_param DOCUMENT_ROOT $realpath_root;
+        internal;
+    }
+
+    location ~ \.php$ {
+      return 404;
+    }
+
+    error_log /srv/app/var/log/nginx-schulddossier_error.log;
+    access_log /srv/app/var/log/nginx-schulddossier_access.log;
+}
diff --git a/docker/nginx/vhost-production.conf b/docker/nginx/vhost-production.conf
@@ -0,0 +1,72 @@
+server {
+    server_name _;
+    listen 0.0.0.0:80;
+    root /srv/app/public;
+
+    add_header Access-Control-Allow-Origin https://schulddossier.amsterdam.nl;
+
+    location / {
+        try_files $uri /index.php$is_args$args;
+    }
+
+    location ~ ^/index\.php(/|$) {
+        fastcgi_pass 127.0.0.1:9000;
+        fastcgi_split_path_info ^(.+\.php)(/.*)$;
+        include fastcgi_params;
+
+        fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
+        fastcgi_param DOCUMENT_ROOT $realpath_root;
+        internal;
+    }
+
+    location ~ \.php$ {
+        return 404;
+    }
+
+    error_log /srv/app/var/log/nginx-schulddossier_error.log;
+    access_log /srv/app/var/log/nginx-schulddossier_access.log;
+}
+
+server {
+    server_name _;
+
+    listen 443 ssl http2;
+    listen [::]:443 ssl http2;
+
+    root /srv/app/public;
+
+    add_header Access-Control-Allow-Origin https://schulddossier.amsterdam.nl;
+
+    ssl on;
+
+    ssl_certificate /srv/localhost.crt;
+    ssl_certificate_key /srv/localhost.key;
+
+    ssl_session_timeout 1d;
+    ssl_session_cache shared:SSL:50m;
+    ssl_session_tickets off;
+    ssl_protocols TLSv1.2;
+    ssl_ciphers 'ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256';
+    ssl_prefer_server_ciphers on;
+
+    location / {
+        try_files $uri /index.php$is_args$args;
+    }
+
+    location ~ ^/index\.php(/|$) {
+        fastcgi_pass 127.0.0.1:9000;
+        fastcgi_split_path_info ^(.+\.php)(/.*)$;
+        include fastcgi_params;
+
+        fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
+        fastcgi_param DOCUMENT_ROOT $realpath_root;
+        internal;
+    }
+
+    location ~ \.php$ {
+      return 404;
+    }
+
+    error_log /srv/app/var/log/nginx-schulddossier_error.log;
+    access_log /srv/app/var/log/nginx-schulddossier_access.log;
+}