]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
fbb-web - remove HTTP auth
authorThomas Dalichow <thomas.dalichow@publicispixelpark.de>
Fri, 13 Jul 2018 10:27:08 +0000 (12:27 +0200)
committerThomas Dalichow <thomas.dalichow@publicispixelpark.de>
Fri, 13 Jul 2018 10:27:08 +0000 (12:27 +0200)
customer/fbb-web/test.yaml

index 1d14973f33d15ae2ad0a31c590a18e620607c0d9..4f1fe196f703f8e88c92259df2a9e0092aa147fd 100644 (file)
@@ -142,8 +142,6 @@ infra::profile::nginx_php_fpm_server::vhosts:
 # Wichtig damit auch die Uploadeinstellungen der php.ini greifen
     client_max_body_size: '32M'
     listen_port: 80
-    auth_basic: 'Server'
-    auth_basic_user_file: '/etc/nginx/.htpasswd'
     access_log: '/var/log/nginx/tst-berhub-access_log'
     error_log: '/var/log/nginx/tst-berhub-error_log'
     format_log: 'combined'
@@ -157,16 +155,6 @@ infra::profile::nginx_php_fpm_server::vhosts:
     autoindex: 'on'
     raw_prepend:
       - 'if ($http_x_forwarded_proto != "https") { return 301 https://$host$request_uri; }'
-    vhost_cfg_prepend:
-      satisfy: 'any'
-      allow:
-        - '217.66.48.0/24'
-        - '217.66.49.0/24'
-        - '217.66.50.0/24'
-        - '217.66.51.0/24'
-        - '217.66.56.0/24'
-        - '194.174.72.0/21'
-      deny: 'all'
   tst-berhub-berlin-airport-de_ssl:
     ensure: present
     www_root: '/srv/www/tst-berhub-berlin-airport-de'
@@ -189,8 +177,6 @@ infra::profile::nginx_php_fpm_server::vhosts:
     client_max_body_size: '32M'
     listen_port: 443
     ssl_port: 444
-    auth_basic: 'Server'
-    auth_basic_user_file: '/etc/nginx/.htpasswd'
     access_log: '/var/log/nginx/tst-berhub-access_log'
     error_log: '/var/log/nginx/tst-berhub-error_log'
     format_log: 'combined'
@@ -205,16 +191,6 @@ infra::profile::nginx_php_fpm_server::vhosts:
     raw_prepend:
       - 'add_header Strict-Transport-Security "max-age=31536000" always;'
       - 'if ($http_x_forwarded_proto != "https") { return 301 https://$host$request_uri; }'
-    vhost_cfg_prepend:
-      satisfy: 'any'
-      allow:
-        - '217.66.48.0/24'
-        - '217.66.49.0/24'
-        - '217.66.50.0/24'
-        - '217.66.51.0/24'
-        - '217.66.56.0/24'
-        - '194.174.72.0/21'
-      deny: 'all'
   tst-wifi-berlin-airport-de:
     www_root: '/srv/www/tst-wifi-berlin-airport-de'
     index_files: