From: Robert Waffen Date: Fri, 14 Sep 2018 15:06:07 +0000 (+0200) Subject: fix lint for fbb-web X-Git-Tag: v0.1.0~101 X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=7b92dc81c7645ceb3c14efb69fac2ccfb32f6b51;p=pixelpark%2Fhiera.git fix lint for fbb-web --- diff --git a/customer/fbb-web/common.yaml b/customer/fbb-web/common.yaml index 0a7ec7d5..06773897 100644 --- a/customer/fbb-web/common.yaml +++ b/customer/fbb-web/common.yaml @@ -4,7 +4,7 @@ infra::additional_classes: # Postfix Config postfix::myorigin: 'pixelpark.com' -#infra::profile::postfix::transport_maps_source: 'maps/transport-fbb' +# infra::profile::postfix::transport_maps_source: 'maps/transport-fbb' infra::profile::postfix::virtual_aliases_source: 'maps/virtual-nullclient-fbb' motd::custom_text: "+---------------------------+\n| Pixelpark Notfallnummern: |\n| 8x5: 030 5058 1701 |\n| 24x7: 030 5058 1750 |\n+---------------------------+\n" diff --git a/customer/fbb-web/dev-web01-berlin-airport-de.pixelpark.net.yaml b/customer/fbb-web/dev-web01-berlin-airport-de.pixelpark.net.yaml index 0943c4bb..3ec29d42 100644 --- a/customer/fbb-web/dev-web01-berlin-airport-de.pixelpark.net.yaml +++ b/customer/fbb-web/dev-web01-berlin-airport-de.pixelpark.net.yaml @@ -4,4 +4,3 @@ infra::additional_classes: - infra::profile::nginx_php_fpm_server - infra::profile::mysql_server - logstash - diff --git a/customer/fbb-web/development.yaml b/customer/fbb-web/development.yaml index 203b1632..87fcb5f4 100644 --- a/customer/fbb-web/development.yaml +++ b/customer/fbb-web/development.yaml @@ -350,5 +350,3 @@ infra::profile::nginx_php_fpm_server::location: fastcgi_buffers: '4 128k' fastcgi_pass: '127.0.0.1:9000' fastcgi_index: 'index.php' - - diff --git a/customer/fbb-web/production.yaml b/customer/fbb-web/production.yaml index 42165730..4b2258e9 100644 --- a/customer/fbb-web/production.yaml +++ b/customer/fbb-web/production.yaml @@ -88,7 +88,7 @@ infra::profile::nginx_php_fpm_server::upstream: - 'localhost:9000' nginx::config::http_cfg_append: - #BERFBB-3340 + # BERFBB-3340 set_real_ip_from: - '93.188.107.58' - '93.188.107.59' @@ -175,14 +175,14 @@ infra::profile::nginx_php_fpm_server::vhosts: - 'wifi01.berlin-airport.de' - 'wifi02.berlin-airport.de' rewrite_rules: - #BERFBB-3339 - - '^#/(.*) $1 permanent' - #BERFBB-3240 + # BERFBB-3339 + - '^#/(.*) $1 permanent' + # BERFBB-3240 - '^$|^/$ txl/ permanent' # - '/wp-admin$ $scheme://$host$uri/ permanent' # - '/files/$ /index.php last' location_allow: - #fbb-wifi-controller + # fbb-wifi-controller - '89.27.154.40/29' - '89.27.154.8/29' # pixelpark IP's @@ -196,9 +196,9 @@ infra::profile::nginx_php_fpm_server::vhosts: - '10.90.14.0/24' # Publicis HTTP Proxy - '213.61.241.82' - #monitoring + # monitoring - '78.46.85.155/24' - #FBB VPN + # FBB VPN - '172.18.49.0/24' # FBB '194.174.72.0 - 194.174.79.255' - '194.174.72.0/21' @@ -239,16 +239,16 @@ infra::profile::nginx_php_fpm_server::vhosts: - 'wifi01.berlin-airport.de' - 'wifi02.berlin-airport.de' rewrite_rules: - #BERFBB-3339 - - '^#/(.*) $1 permanent' - #BERFBB-3240 + # BERFBB-3339 + - '^#/(.*) $1 permanent' + # BERFBB-3240 - '^$|^/$ txl/ permanent' - #BERFBB-3234 + # BERFBB-3234 - '^([^.]*[^/])$ https://wifi.berlin-airport.de$1/ permanent' # - '/wp-admin$ $scheme://$host$uri/ permanent' # - '/files/$ /index.php last' location_allow: - #fbb-wifi-controller + # fbb-wifi-controller - '89.27.154.40/29' - '89.27.154.8/29' # pixelpark IP's @@ -263,9 +263,9 @@ infra::profile::nginx_php_fpm_server::vhosts: - '10.90.14.0/24' # Publicis HTTP Proxy - '213.61.241.82' - #monitoring + # monitoring - '78.46.85.155/24' - #FBB VPN + # FBB VPN - '172.18.49.0/24' # FBB '194.174.72.0 - 194.174.79.255' - '194.174.72.0/21' @@ -290,7 +290,7 @@ infra::profile::nginx_php_fpm_server::vhosts: # - '/index.php?$args' autoindex: 'on' -##siehe: GRIDPARK-4137 +# siehe: GRIDPARK-4137 # ila-berlin-airport-de: # www_root: '/srv/www/ila-berlin-airport-de' # index_files: diff --git a/customer/fbb-web/test.yaml b/customer/fbb-web/test.yaml index 82210748..6a36b249 100644 --- a/customer/fbb-web/test.yaml +++ b/customer/fbb-web/test.yaml @@ -55,7 +55,7 @@ accounts::users: sudo: true katja.liell: apply: true - group: 'nginx' + group: 'nginx' sudo: true mysql::server::root_password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAVEnDEuZKy7xtfPvCGgTIgYEQ5Pca+udKFnxB5h3JSd6wuelU/p+cAAqGQVL1kCNZFJljAX479eZRp29bB0B8C22xWM+dsiOFRAiDKDPlVLRH96kysQC9im9MR4Qz5orcxEIUUQ3v5bWeQChEhhf+CJSBY7NoJcXEnI5urWMTZAKjtIhPrbT+VWnBz//7sBBQyiKPmdUkowyUG0n2H2kz2ss7F9P8SH6KPuhaCHK5dU1IsxAdQyrDToiaTu6qOCGpddlYY9xSJLtD9kx0kH3ynL/MHQWEfDVtVcdVltVRibAyU9D3SN8mUDj8JUuVIyenSGaqyzsXSnDzEjQqj5vGBTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCu7MS7qNeEKG8vYdt2/SQpgBC546WyJQC7GTYh4T7wzeah] @@ -114,7 +114,7 @@ infra::profile::nginx_php_fpm_server::upstream: - 'localhost:9000' nginx::config::http_cfg_append: - #BERFBB-3340 + # BERFBB-3340 set_real_ip_from: - '93.188.107.121' - '93.188.107.122' @@ -201,12 +201,12 @@ infra::profile::nginx_php_fpm_server::vhosts: - 'tst02-wifi-berlin-airport-de.pixelpark.net' - 'tstwifi.berlin-airport.de' rewrite_rules: - #BERFBB-3339 - - '^#/(.*) $1 permanent' - #BERFBB-3240 + # BERFBB-3339 + - '^#/(.*) $1 permanent' + # BERFBB-3240 - '^$|^/$ txl/ permanent' location_allow: - #fbb-wifi-controller + # fbb-wifi-controller - '89.27.154.40/29' - '89.27.154.8/29' # pixelpark IP's @@ -220,7 +220,7 @@ infra::profile::nginx_php_fpm_server::vhosts: - '10.90.14.0/24' # Publicis HTTP Proxy - '213.61.241.82' - #FBB VPN + # FBB VPN - '172.18.49.0/24' # FBB '194.174.72.0 - 194.174.79.255' - '194.174.72.0/21' @@ -250,14 +250,14 @@ infra::profile::nginx_php_fpm_server::vhosts: - 'tst02-wifi-berlin-airport-de.pixelpark.net' - 'tstwifi.berlin-airport.de' rewrite_rules: - #BERFBB-3339 - - '^#/(.*) $1 permanent' - #BERFBB-3240 + # BERFBB-3339 + - '^#/(.*) $1 permanent' + # BERFBB-3240 - '^$|^/$ txl/ permanent' - #BERFBB-3234 + # BERFBB-3234 - '^([^.]*[^/])$ https://tst-wifi-berlin-airport-de.pixelpark.net$1/ permanent' location_allow: - #fbb-wifi-controller + # fbb-wifi-controller - '89.27.154.40/29' - '89.27.154.8/29' # pixelpark IP's @@ -271,7 +271,7 @@ infra::profile::nginx_php_fpm_server::vhosts: - '10.90.14.0/24' # Publicis HTTP Proxy - '213.61.241.82' - #FBB VPN + # FBB VPN - '172.18.49.0/24' # FBB '194.174.72.0 - 194.174.79.255' - '194.174.72.0/21' @@ -457,4 +457,3 @@ infra::profile::nginx_php_fpm_server::location: fastcgi_buffers: '4 128k' fastcgi_pass: '127.0.0.1:9000' fastcgi_index: 'index.php' -