]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
Config files fixes
authorStefan Teschke <steschke@dhcp-client-217-66-50-77.pixelpark.com>
Tue, 6 Jun 2017 08:48:16 +0000 (10:48 +0200)
committerStefan Teschke <steschke@dhcp-client-217-66-50-77.pixelpark.com>
Tue, 6 Jun 2017 08:48:16 +0000 (10:48 +0200)
85 files changed:
customer/aamt/web-aamt-facebook.pixelpark.net.yaml
customer/basf/development.yaml
customer/bbm_aem/dev-author-dispatcher01-bbm.pixelpark.net.yaml
customer/bbm_aem/dev-author01-bbm.pixelpark.net.yaml
customer/bbm_aem/dev-dispatcher01-bbm.pixelpark.net.yaml
customer/bbm_aem/development.yaml
customer/bkk-vbu/dev-web01-meine-krankenkasse-de.pixelpark.net.yaml
customer/bmas-anmeldung/common.yaml
customer/bmas-anmeldung/test-www-anmeldung02-bmas-de.pixelpark.net.yaml
customer/bmas-g20/www-g20-bmas.pixelpark.net.yaml
customer/bmas-sgb2/dev-sgb2-info.pixelpark.net.yaml
customer/bmas-sgb2/production.yaml
customer/bmas-sgb2/test-web01-sgb2-info.pixelpark.net.yaml
customer/bmas-sgb2/test.yaml
customer/bmas-sgb2/web01-sgb2-info.pixelpark.net.yaml
customer/bmas-typo3/common.yaml
customer/bmas-typo3/production.yaml
customer/bmas-typo3/test.yaml
customer/bmas/db01-bmas-gsb6-de.pixelpark.net.yaml
customer/bmas/db02-bmas-gsb6-de.pixelpark.net.yaml
customer/bmas/master01-bmas-gsb6-de.pixelpark.net.yaml
customer/bmas/slave01-bmas-gsb6-de.pixelpark.net.yaml
customer/bmas/test-db01-bmas-gsb6-de.pixelpark.net.yaml
customer/bmas/test-db02-bmas-gsb6-de.pixelpark.net.yaml
customer/bmas/test-lb-bmas-de.pixelpark.net.yaml
customer/bmas/test-master01-bmas-gsb6-de.pixelpark.net.yaml
customer/bmas/test-slave01-bmas-gsb6-de.pixelpark.net.yaml
customer/bmas/test-www-anmeldung-bmas-de.pixelpark.net.yaml
customer/bmas/test-www01-bmas-gsb6-de.pixelpark.net.yaml
customer/bmas/test-www02-bmas-gsb6-de.pixelpark.net.yaml
customer/bmas/test.yaml
customer/bmas/www-anmeldung-bmas-de.pixelpark.net.yaml
customer/bmas/www01-bmas-gsb6-de.pixelpark.net.yaml
customer/bmbf/common.yaml
customer/bmbf/test-web02-bmbf.pixelpark.net.yaml
customer/bmbf/web02-bmbf.pixelpark.net.yaml
customer/bmf-datacenter/common.yaml
customer/bmf-datacenter/production.yaml
customer/bmf-europa/common.yaml
customer/bmf-europa/web-so-klingt-europa-de.pixelpark.net.yaml
customer/bmf/db01-bmf-de.pixelpark.net.yaml
customer/bmf/db02-bmf-de.pixelpark.net.yaml
customer/bmf/db02-red-bmf-de.pixelpark.net.yaml
customer/bmf/db03-bmf-de.pixelpark.net.yaml
customer/bmf/dev-bmf-de.pixelpark.net.yaml
customer/bmf/development.yaml
customer/bmf/master01-bmf-de.pixelpark.net.yaml
customer/bmf/red-bmf-de.pixelpark.net.yaml
customer/bmf/slave01-bmf-de.pixelpark.net.yaml
customer/bmf/test-db01-bmf-de.pixelpark.net.yaml
customer/bmf/test-db02-bmf-de.pixelpark.net.yaml
customer/bmf/test-db03-bmf-de.pixelpark.net.yaml
customer/bmf/test-master01-bmf-de.pixelpark.net.yaml
customer/bmf/test-slave01-bmf-de.pixelpark.net.yaml
customer/bmf/test-www01-bmf-de.pixelpark.net.yaml
customer/bmf/test-www02-bmf-de.pixelpark.net.yaml
customer/bmf/test.yaml
customer/bmwi-gruenderwoche/production.yaml
customer/bmwi-gruenderwoche/test.yaml
customer/bmwi/db01-bmwi-de.pixelpark.net.yaml
customer/bmwi/db02-bmwi-de.pixelpark.net.yaml
customer/bmwi/dev-bmwi.pixelpark.net.yaml
customer/bmwi/dev-db-bmwi-de.pixelpark.net.yaml
customer/bmwi/master01-bmwi-de.pixelpark.net.yaml
customer/bmwi/slave01-bmwi-de.pixelpark.net.yaml
customer/bmwi/test-db01-bmwi-de.pixelpark.net.yaml
customer/bmwi/test-db02-bmwi-de.pixelpark.net.yaml
customer/bmwi/test-listserv-bmwi-de.pixelpark.net.yaml
customer/bmwi/test.yaml
customer/bmwi/www01-bmwi-de.pixelpark.net.yaml
customer/buschjaeger/common.yaml
customer/buschjaeger/db02-buschjaeger-de.pixelpark.net.yaml
customer/buschjaeger/production.yaml
customer/buschjaeger/web01-buschjaeger-de.pixelpark.net.yaml
customer/buschjaeger/web02-buschjaeger-de.pixelpark.net.yaml
customer/cosar-test-customer/cosar-centos.pixelpark.com.yaml
modules/apache.yaml
modules/epel.yaml
modules/mcollective.yaml
modules/mysql.yaml
modules/ntp.yaml
modules/php.yaml
modules/repo.yaml
modules/rvm.yaml
modules/zabbix.yaml

index 7828c06f8cb4ef2a0dea6cfffc99c90b275a9d65..4c157646881b34a9ffe32756108463eb91b3ce83 100644 (file)
@@ -36,15 +36,15 @@ infra::profile::apache::pp_vhosts:
         allow_override:
           - All
         directoryindex: 'index.php index.html'
-#      - location1:
-#        provider: location
-#        path: '/'
-#        auth_type: Digest
-#        auth_name: server
-#        auth_digest_provider: file
-#        auth_digest_algorithm: MD5
-#        auth_user_file: '/etc/httpd/htdigest'
-#        auth_require: 'valid-user'
+        #      - location1:
+        #        provider: location
+        #        path: '/'
+        #        auth_type: Digest
+        #        auth_name: server
+        #        auth_digest_provider: file
+        #        auth_digest_algorithm: MD5
+        #        auth_user_file: '/etc/httpd/htdigest'
+        #        auth_require: 'valid-user'
   test-aamt-facebook:
     servername: test-aamt-facebook.pixelpark.net
     serveraliases:
@@ -89,4 +89,4 @@ infra::profile::apache_php::fpm_pool:
 
 php::fpm::pools:
   www:
-    ensure: absent
\ No newline at end of file
+    ensure: absent
index 3534ca5db17c6daf93510ad005170b9c73af5417..6800549e7c90ecbbde5643f9557d719eb8596041 100644 (file)
@@ -7,14 +7,14 @@ accounts::users:
     apply: true
     sudo: true
 #
-#infra::additional_classes:
+# infra::additional_classes:
 #  - apache::mod::headers
 #  - infra::profile::apache
 #  - apache::mod::proxy_ajp
 #  - infra::profile::mysql_server
 #
-#infra::profile::apache::pp_vhosts:
-####test-dev-basftoday:
+# infra::profile::apache::pp_vhosts:
+# ###test-dev-basftoday:
 #    servername: test-dev-basftoday-de.pixelpark.net
 #    ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
 #    ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
index 0776febd9e7cb4000f53ea4f75a02e6a1ab04cb9..8d5c88e0164665b272550f0ec53a1a0f702f1491 100644 (file)
@@ -1,4 +1,4 @@
 ---
 aem::dispatcher::proxy_host: dev-author01-bbm.pixelpark.net
 aem::dispatcher::proxy_port: 4502
-aem::dispatcher::type: author
\ No newline at end of file
+aem::dispatcher::type: author
index 1c593e7b7c3366ada721e97bea062744a58086d4..5d064c754d030f34e0b0f90fa67e4f7f9ff3b1c0 100644 (file)
@@ -2,4 +2,3 @@
 infra::additional_classes:
   - aem::author
   - aem
-
index 4b9ae2ee247262e92c136133154881598c5afbed..fc11f1715acbf58c8ae009e1566f114be85f41f8 100644 (file)
@@ -1,4 +1,4 @@
 ---
 infra::role: base
 aem::dispatcher::proxy_host: dev-publish01-bbm.pixelpark.net
-aem::dispatcher::proxy_port: 4503
\ No newline at end of file
+aem::dispatcher::proxy_port: 4503
index 54dcf0f41c35db44a9b5beb34f5a8f6c6b2f2403..9df5e23808a9fc54959abc468423964f1a0e5adb 100644 (file)
@@ -7,8 +7,8 @@ aem::author::install_mode: 'quickstart'
 aem::author::install_options:
   download_type: maven
   download_uri: "com.pixelpark.aem.bbm:aem-quickstart:6.0:jar"
-#aem::author::install_mode: 'backup'
-#aem::author::install_options:
+# aem::author::install_mode: 'backup'
+# aem::author::install_options:
 #  download_type: 'wget'
 #  download_uri: 'http://tools-bbm.pixelpark.net:8081/nexus/service/local/repositories/thirdparty/content/com/pixelpark/aem/bbm/aem_base_author/0.1.0/aem_base_author-0.1.0.tar.gz'
 
@@ -26,8 +26,8 @@ aem::publish::install_mode: 'quickstart'
 aem::publish::install_options:
   download_type: maven
   download_uri: "com.pixelpark.aem.bbm:aem-quickstart:6.0:jar"
-#aem::publish::install_mode: 'backup'
-#aem::publish::install_options:
+# aem::publish::install_mode: 'backup'
+# aem::publish::install_options:
 #  download_type: 'wget'
 #  download_uri: 'http://tools-bbm.pixelpark.net:8081/nexus/service/local/repositories/thirdparty/content/com/pixelpark/aem/bbm/aem_base_publish/0.1.0/aem_base_publish-0.1.0.tar.gz'
 
@@ -40,7 +40,7 @@ aem::publish::packages:
 aem::manage_oracle_java: true
 aem::base_path: '/opt/aem'
 aem::maven::install: true
-aem::maven::repos: 
+aem::maven::repos:
   - "id": "pixelpark.nexus"
     "url": "http://tools-bbm.pixelpark.net:8081/nexus/content/repositories/thirdparty/"
 
@@ -67,7 +67,6 @@ aem::domain_mappings:
   dev-site03-bbm.pixelpark.net:
     path: "/content/geometrixx-outdoors"
     default_lang: en
-    
 aem::hosts:
   dev-publish01-bbm.pixelpark.net:
     ip: '77.74.232.106'
@@ -84,4 +83,4 @@ aem::hosts:
   dev-dispatcher02-bbm.pixelpark.net:
     ip: '77.74.232.107'
     host_aliases:
-      - flush02
\ No newline at end of file
+      - flush02
index 0e2834777893af53929a55eccda85c3d34618bf9..7b1d5970cc938a0c39c7c769627aa7408e2d9ac1 100644 (file)
@@ -64,7 +64,7 @@ infra::profile::apache::pp_vhosts:
           - FollowSymLinks
           - MultiViews
         allow_override:
-        - None
+          - None
       - preapproot:
         provider: directory
         path: '/var/www/bkk-express-proxy'
@@ -100,10 +100,10 @@ infra::profile::apache::pp_vhosts:
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
-   headers:
-#      - 'set X-Frame-Options: sameorigin'
-#      - 'set X-XSS-Protection: "1; mode=block"'
-#      - 'set X-Content-Type-Options: nosniff'
+    #   headers:
+    #      - 'set X-Frame-Options: sameorigin'
+    #      - 'set X-XSS-Protection: "1; mode=block"'
+    #      - 'set X-Content-Type-Options: nosniff'
     headers_ssl:
       - 'always set Strict-Transport-Security "max-age=31556926"'
     custom_fragment: |
@@ -126,12 +126,12 @@ infra::profile::apache::pp_vhosts:
           - FollowSymLinks
           - MultiViews
         allow_override:
-        - None
+      - None
       - preapproot:
         provider: directory
         path: '/var/www/bkk-imagetool'
         options:
-        - None
+      - None
 
 infra::profile::typo3::projects:
   cms01:
@@ -145,7 +145,7 @@ infra::profile::typo3::projects:
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
-#   redirect_dest_non_ssl: 'https://dev-cms01-meine-krankenkasse-de.pixelpark.net/'
+    # redirect_dest_non_ssl: 'https://dev-cms01-meine-krankenkasse-de.pixelpark.net/'
     user: deploy.vogel
     mode: '2775'
 
@@ -158,7 +158,7 @@ infra::profile::symfony::projects:
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
-#   redirect_dest_non_ssl: 'https://dev-member01-meine-krankenkasse-de.pixelpark.net'
+    # redirect_dest_non_ssl: 'https://dev-member01-meine-krankenkasse-de.pixelpark.net'
     user: deploy.vogel
     mode: '2775'
     setenv:
@@ -173,7 +173,7 @@ infra::profile::symfony::projects:
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
-#   redirect_dest_non_ssl: 'https://dev-info01-meine-krankenkasse-de.pixelpark.net'
+    # redirect_dest_non_ssl: 'https://dev-info01-meine-krankenkasse-de.pixelpark.net'
     user: deploy.vogel
     mode: '2775'
     setenv:
index 16a8e5c205cbf579f6fb4c41c51ace7987202a1b..95cb9c29a9f7eaabfc05e3beaa429ec7fe223201 100644 (file)
@@ -6,4 +6,4 @@ accounts::users:
     apply: true
     sudo: true
 
-mcollective::core_libdir: '/usr/share/mcollective/plugins/'
\ No newline at end of file
+mcollective::core_libdir: '/usr/share/mcollective/plugins/'
index df1f8589ca27aafe35b0a7db68fd3bb834517807..1b083d9d889829a7d8d5e9db250c3acf7e71b579 100644 (file)
@@ -11,7 +11,7 @@ infra::profile::apache::pp_vhosts:
     serveraliases:
       - test-www-anmeldung02-bmas-de.pixelpark.net
     cert_servername: 'wildcard.pixelpark.net'
-    cert_customer: 'pixelpark'      
+    cert_customer: 'pixelpark'
     ssl_cert: '/etc/ssl/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/ssl/private/wildcard.pixelpark.net-key.pem'
     ssl_chain: '/etc/ssl/certs/wildcard.pixelpark.net-cert.pem'
index 6762ff013c14cdfecbfd752ff6aed61a71f0b93f..9b6bb5fe98f4ea3f134e0d77bfdb64073731665a 100644 (file)
@@ -31,8 +31,8 @@ infra::profile::apache::pp_vhosts:
       - www-g20-bmas.pixelpark.net
     cert_servername: 'www.g20ewg.org'
     cert_customer: 'bmas'
-    cert_servername: 'www.g20ewg.org'
-    cert_customer: 'bmas'
+    cert_servername: 'www.g20ewg.org'
+    cert_customer: 'bmas'
     ssl_cert: '/etc/pki/tls/certs/www.g20ewg.org-cert.pem'
     ssl_chain: '/etc/pki/tls/certs/www.g20ewg.org-cert.pem'
     ssl_key: '/etc/pki/tls/private/www.g20ewg.org-key.pem'
index 268cbc7b1785b891c8e99fcf2a34679e9cd8435d..9a63bd1132c544ace37b206009cb25f6d4e4e8f2 100644 (file)
@@ -25,7 +25,7 @@ infra::additional_classes:
 
 solr::cores:
   drupal:
-    replace: true # Can trigger a restart from Solr if a change is found
+    replace: true  # Can trigger a restart from Solr if a change is found
     protwords_src_file: /srv/www/gf.sgb2.info/profiles/openatrium/modules/init/features/init_search/solr-conf/5.x/protwords.txt
     schema_src_file: /srv/www/gf.sgb2.info/profiles/openatrium/modules/init/features/init_search/solr-conf/5.x/schema.xml
     solrconfig_src_file: /srv/www/gf.sgb2.info/profiles/openatrium/modules/init/features/init_search/solr-conf/5.x/solrconfig.xml
@@ -60,7 +60,7 @@ infra::profile::mysql_server::databases:
 php::extensions:
   gd: {}
   mbstring: {}
- pecl-uploadprogress: {} -> benoetigt remi
+  # pecl-uploadprogress: {} -> benoetigt remi
   mysqlnd: {}
   opcache: {}
 
@@ -80,7 +80,7 @@ infra::profile::drupal::projects:
     ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem
     ssl_chain: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem
     ssl_key: /etc/pki/tls/private/wildcard.pixelpark.net-key.pem
-    #SetEnvIf User-Agent         ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0
+    # SetEnvIf User-Agent         ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0
     mode: '2775'
     directories:
       - location1:
@@ -101,7 +101,7 @@ infra::profile::drupal::projects:
     ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem
     ssl_chain: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem
     ssl_key: /etc/pki/tls/private/wildcard.pixelpark.net-key.pem
-    #SetEnvIf User-Agent         ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0
+    # SetEnvIf User-Agent         ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0
     mode: '2775'
     directories:
       - location1:
index 7244f9ffe5f3abad64fd3d7e3ced34703858ea8f..b867b8de1ccb0ba318573d2e7a6a4215ad21c49b 100644 (file)
@@ -2,4 +2,4 @@
 
 infra::profile::apache::htdigest:
   server:
-    www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAYev9tYQG8tu4heqI8/rlMBnpik9HBnIgO1ZMPPUsBRMzuvvb3Qo5tbVvatrMoFmIMx1nQGD98HiBF7onC3AwCkm7zRUMxMDUIBNXYSDYwBBfb14cbydDYlp8Gz3Qxm6/Rrb3rycOOWyw+/xnR6Mrtrfv7dlmwLgWou3toQDoDu00I/nwqJ1qBOSO/38PtLSSZ85l6P0dnQbbdXI2IXQhwr7cqhpD13EvVQIRmoo7MCN6trAuSyxJ/9lid0Dy8TcTE3Yu6DUzHlTEr81QivhcSm9cPelL69FupU8nMfwxRoMtlCV4GpTVAY97sHHE0o4+EW6MBbEtpdriG3xmiXuq2DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBIWs9p47LWQCgE9huA5g0rgCDu//btUahADcKnwLWcDztViIt4cCoMnOi76XAzPB8+sQ==]
\ No newline at end of file
+    www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAYev9tYQG8tu4heqI8/rlMBnpik9HBnIgO1ZMPPUsBRMzuvvb3Qo5tbVvatrMoFmIMx1nQGD98HiBF7onC3AwCkm7zRUMxMDUIBNXYSDYwBBfb14cbydDYlp8Gz3Qxm6/Rrb3rycOOWyw+/xnR6Mrtrfv7dlmwLgWou3toQDoDu00I/nwqJ1qBOSO/38PtLSSZ85l6P0dnQbbdXI2IXQhwr7cqhpD13EvVQIRmoo7MCN6trAuSyxJ/9lid0Dy8TcTE3Yu6DUzHlTEr81QivhcSm9cPelL69FupU8nMfwxRoMtlCV4GpTVAY97sHHE0o4+EW6MBbEtpdriG3xmiXuq2DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBIWs9p47LWQCgE9huA5g0rgCDu//btUahADcKnwLWcDztViIt4cCoMnOi76XAzPB8+sQ==]
index 2f28c4b318ed1111b4c54873174a4bbb54deff8e..83da8a70d1dfb7d459a5f9750c64b55f7f08bf15 100644 (file)
@@ -8,7 +8,7 @@ infra::additional_classes:
 
 solr::cores:
   drupal:
-    replace: true # Can trigger a restart from Solr if a change is found
+    replace: true  # Can trigger a restart from Solr if a change is found
     protwords_src_file: /srv/www/gf.sgb2.info/profiles/openatrium/modules/init/features/init_search/solr-conf/5.x/protwords.txt
     schema_src_file: /srv/www/gf.sgb2.info/profiles/openatrium/modules/init/features/init_search/solr-conf/5.x/schema.xml
     solrconfig_src_file: /srv/www/gf.sgb2.info/profiles/openatrium/modules/init/features/init_search/solr-conf/5.x/solrconfig.xml
@@ -62,7 +62,7 @@ repo::remi_php56: true
 php::extensions:
   gd: {}
   mbstring: {}
- pecl-uploadprogress: {} -> benoetigt remi
+  # pecl-uploadprogress: {} -> benoetigt remi
   mysqlnd: {}
   opcache: {}
 
@@ -77,7 +77,7 @@ infra::profile::drupal::projects:
     ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem
     ssl_chain: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem
     ssl_key: /etc/pki/tls/private/wildcard.pixelpark.net-key.pem
-    #SetEnvIf User-Agent         ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0
+    # SetEnvIf User-Agent         ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0
     mode: '2775'
     directories:
       - directory_root:
@@ -98,13 +98,13 @@ infra::profile::drupal::projects:
         auth_digest_algorithm: MD5
         auth_user_file: '/etc/httpd/htdigest'
         auth_require: 'valid-user'
-#    rewrites:
-#      - http_to_https:
-#        comment: 'Alles auf https umleiten'
-#        rewrite_cond:
-#          - '%%{ich-trickse}{HTTPS} !=on'
-#        rewrite_rule:
-#          - ^(.*)$  https://gf.sgb2.info$1  [R=301,L]
+        #    rewrites:
+        #      - http_to_https:
+        #        comment: 'Alles auf https umleiten'
+        #        rewrite_cond:
+        #          - '%%{ich-trickse}{HTTPS} !=on'
+        #        rewrite_rule:
+        #          - ^(.*)$  https://gf.sgb2.info$1  [R=301,L]
     php_admin_value:
       post_max_size: 128M
       upload_max_filesize: 128M
@@ -114,11 +114,11 @@ infra::profile::drupal::projects:
     servername: old-www-gf-sgb2-info.pixelpark.net
     ssl: true
     cert_servername: 'wildcard.pixelpark.net'
-    cert_customer: 'pixelpark'    
+    cert_customer: 'pixelpark'
     ssl_cert: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem
     ssl_chain: /etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem
     ssl_key: /etc/pki/tls/private/wildcard.pixelpark.net-key.pem
-    #SetEnvIf User-Agent         ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0
+    # SetEnvIf User-Agent         ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0
     mode: '2775'
     directories:
       - directory_root:
@@ -138,4 +138,4 @@ infra::profile::drupal::projects:
         auth_digest_provider: file
         auth_digest_algorithm: MD5
         auth_user_file: '/etc/httpd/htdigest'
-        auth_require: 'valid-user'
\ No newline at end of file
+        auth_require: 'valid-user'
index 41ce0ec0959cddc3a04a32a521ce7123dd47bc56..61bde809779f01de0327adfa550974de53f8efc8 100644 (file)
@@ -17,4 +17,4 @@ sudo::configs:
   jenkins_deploy:
     priority: "06"
     content: |
-      jenkins ALL=(apache) NOPASSWD: ALL
\ No newline at end of file
+      jenkins ALL=(apache) NOPASSWD: ALL
index 3af68f4e1a481328022951d8628333b2f5410271..721bc7939fe6839ed306de24bb236eb0f97f0ca6 100644 (file)
@@ -8,7 +8,7 @@ infra::additional_classes:
 
 solr::cores:
   drupal:
-    replace: true # Can trigger a restart from Solr if a change is found
+    replace: true  # Can trigger a restart from Solr if a change is found
     protwords_src_file: /srv/www/gf.sgb2.info/profiles/openatrium/modules/init/features/init_search/solr-conf/5.x/protwords.txt
     schema_src_file: /srv/www/gf.sgb2.info/profiles/openatrium/modules/init/features/init_search/solr-conf/5.x/schema.xml
     solrconfig_src_file: /srv/www/gf.sgb2.info/profiles/openatrium/modules/init/features/init_search/solr-conf/5.x/solrconfig.xml
@@ -56,7 +56,7 @@ php::settings:
 php::extensions:
   gd: {}
   mbstring: {}
- pecl-uploadprogress: {} -> benoetigt remi
+  # pecl-uploadprogress: {} -> benoetigt remi
   mysqlnd: {}
   opcache: {}
 
@@ -74,7 +74,7 @@ infra::profile::drupal::projects:
     ssl_cert: /etc/pki/tls/certs/extranet.sgb2.info-cert.pem
     ssl_chain: /etc/pki/tls/certs/extranet.sgb2.info-cert.pem
     ssl_key: /etc/pki/tls/private/extranet.sgb2.info-key.pem
-    #SetEnvIf User-Agent         ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0
+    # SetEnvIf User-Agent         ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force-response-1.0
     rewrites:
       - http_to_https:
         comment: 'Alles auf https umleiten'
@@ -85,4 +85,4 @@ infra::profile::drupal::projects:
     php_admin_value:
       post_max_size: 128M
       upload_max_filesize: 128M
-      memory_limit: 512M
\ No newline at end of file
+      memory_limit: 512M
index f5103dbda6b0fd7a8647f91031b29c8f16c03c83..8e6747650cc16cc4d5221d7d3c3d377dd6279d1c 100644 (file)
@@ -31,4 +31,4 @@ repo::remi_php56: true
 
 php::fpm::pools:
   www:
-    ensure: absent
\ No newline at end of file
+    ensure: absent
index 16390ec5f9d444e225f5ff977de36f0740b47f2d..837ca46b7e0f72aa462c29ec35259d9bf1a601f2 100644 (file)
@@ -1,7 +1,7 @@
 ---
 infra::role: base
 infra::additional_classes:
-#  - infra::profile::apache_php
+  #  - infra::profile::apache_php
   - infra::profile::typo3
   - mysql::server::backup
   - infra::profile::mysql_server
@@ -54,7 +54,7 @@ memcached::max_memory: 256
 memcached::listen_ip: '127.0.0.1'
 
 php::fpm::pools:
-  fachkraefte-offensive: # Pool for pdfgenerator - pdf.fachkraefte-offensive.de
+  fachkraefte-offensive:  # Pool for pdfgenerator - pdf.fachkraefte-offensive.de
     listen: '/var/run/php5-fpm-fachkraefte-offensive.sock'
     listen_owner: apache
     listen_group: apache
@@ -67,7 +67,7 @@ php::fpm::pools:
     pm_max_requests: '10000'
     pm_status_path: '/php-fpm-status'
     ping_path: '/ping'
-    ping_response:  'pong'
+    ping_response: 'pong'
     request_terminate_timeout: '5m'
     request_slowlog_timeout: '10s'
     slowlog: '/var/log/php-fpm/fachkraefte-offensive-slow.log'
@@ -108,7 +108,7 @@ infra::profile::apache::vhosts:
           - '%%{ich-trickse}{REQUEST_URI} "!^/pdfgenerator"'
         rewrite_rule:
           - '^(.*)$ http://www.fachkraefte-offensive.de [R=301,L]'
-#    custom_fragment: 'ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000/srv/www/pdfgenerator/$1'
+          #    custom_fragment: 'ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://127.0.0.1:9000/srv/www/pdfgenerator/$1'
     directories:
       - directory_docroot:
         provider: 'directory'
@@ -290,7 +290,7 @@ infra::profile::typo3::projects:
       - psyga.inqa-check.de
       - personalplanung.inqa-check.de
       - www.personalplanung.inqa-check.de
-# Pixelpark Addressen
+      # Pixelpark Addressen
       - www-psyga-inqa-check-de.pixelpark.net
       - www-personalplaner-inqa-check-de.pixelpark.net
     cert_servername: 'wildcard.inqa-check.de'
@@ -340,11 +340,11 @@ infra::profile::typo3::projects:
     db_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAoXhIE3LScKk47IO4nXcrbgQNQgsyD75DJhaURzgI2hCfp1RwhpINzL8py6SILYxcibhEyZWUAPf3jVqr2epjeiDH0DsemNUdjCrr58xGW8RVLOkdd9VQJSOsbSWPBaFpd835bf4HTiuC4SV0KIwtcZTY2l72EZ0YftoV0q/sKONgiZfhWvmE7uJ2fq0gADiSh24kj/q+1ySJ9vvB2ZxkzVs/ny7GUA7X9dORgVEXoZRXs3nesoXnqpjfkXmQlKu4+oapoRQ1EPtaWa0cHffTiKGOEdX1LsAIqb3iSjxIoyZM9gtUM2sYqSXgKdOOlZVjaxgQH0E7eVRBwrhgx6Vp/zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDEiAzKKvLBnRd1nJZGmUzZgCDQmTbjzrxht7u+aEbfPNJjxhHY7EM+ChE2NQV6V5iSmg==]
     db_user: inqacheck
     db_name: inqacheck
-    manage_typo3_project: false # selbe docroot wie inqacheck
+    manage_typo3_project: false  # selbe docroot wie inqacheck
     ip: 217.66.58.169
     servername: unternehmenscheck.fachkraefte-offensive.de
     serveraliases:
-# Pixelpark Addressen
+      # Pixelpark Addressen
       - unternehmenscheck-fachkraefte-offensive-de.pixelpark.net
     cert_servername: 'wildcard.pixelpark.net'
     cert_customer: 'pixelpark'
@@ -372,11 +372,11 @@ infra::profile::typo3::projects:
     db_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAoXhIE3LScKk47IO4nXcrbgQNQgsyD75DJhaURzgI2hCfp1RwhpINzL8py6SILYxcibhEyZWUAPf3jVqr2epjeiDH0DsemNUdjCrr58xGW8RVLOkdd9VQJSOsbSWPBaFpd835bf4HTiuC4SV0KIwtcZTY2l72EZ0YftoV0q/sKONgiZfhWvmE7uJ2fq0gADiSh24kj/q+1ySJ9vvB2ZxkzVs/ny7GUA7X9dORgVEXoZRXs3nesoXnqpjfkXmQlKu4+oapoRQ1EPtaWa0cHffTiKGOEdX1LsAIqb3iSjxIoyZM9gtUM2sYqSXgKdOOlZVjaxgQH0E7eVRBwrhgx6Vp/zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDEiAzKKvLBnRd1nJZGmUzZgCDQmTbjzrxht7u+aEbfPNJjxhHY7EM+ChE2NQV6V5iSmg==]
     db_user: inqacheck
     db_name: inqacheck
-    manage_typo3_project: false # selbe docroot wie inqacheck
+    manage_typo3_project: false  # selbe docroot wie inqacheck
     ip: 217.66.58.171
     servername: beschaeftigtencheck.fachkraefte-offensive.de
     serveraliases:
-# Pixelpark Addressen
+      # Pixelpark Addressen
       - beschaeftigtencheck-fachkraefte-offensive-de.pixelpark.net
     cert_servername: 'wildcard.pixelpark.net'
     cert_customer: 'pixelpark'
@@ -406,7 +406,7 @@ infra::profile::typo3::projects:
     ip: 217.66.58.172
     servername: www.fis-netzwerk.de
     serveraliases:
-# Pixelpark Addressen
+      # Pixelpark Addressen
       - www-fis-netzwerk-de.pixelpark.net
       - fis-netzwerk.de
     cert_servername: 'www.fis-netzwerk.de'
index c39cf16c487ae805fd1b7fdab0a1d2c6a235e50d..5c97e8d6a499c72e0889cf47df927b5d59847cae 100644 (file)
@@ -184,7 +184,7 @@ infra::profile::apache_php::vhosts:
     docroot: /srv/www/mikrokredit
     port: 80
     docroot_owner: apache
-    servername:  test-www-mein-mikrokredit-de.pixelpark.net
+    servername: test-www-mein-mikrokredit-de.pixelpark.net
     directories:
       - directory_root:
         provider: directory
index 45b4bd1378564a070c82371b8a86e504b6e51e28..9bc2648672184a388342c0f4f5c12f41a73f0fde 100644 (file)
@@ -1,3 +1,3 @@
 ---
 infra::additional_classes:
-  - accounts
\ No newline at end of file
+  - accounts
index 45b4bd1378564a070c82371b8a86e504b6e51e28..9bc2648672184a388342c0f4f5c12f41a73f0fde 100644 (file)
@@ -1,3 +1,3 @@
 ---
 infra::additional_classes:
-  - accounts
\ No newline at end of file
+  - accounts
index e38c15e7a7fa1ecf7f64a16cd24df6fa7cef6e3e..209f9077603144ecc87b093b71d45d0e63bdfc73 100644 (file)
@@ -2,4 +2,3 @@
 infra::additional_classes:
   - accounts
   - pp_mcollective
-
index 03c1b0f2af7be56b73ea9b59005a570a2399dcf6..9bc2648672184a388342c0f4f5c12f41a73f0fde 100644 (file)
@@ -1,4 +1,3 @@
 ---
 infra::additional_classes:
   - accounts
-
index 45b4bd1378564a070c82371b8a86e504b6e51e28..9bc2648672184a388342c0f4f5c12f41a73f0fde 100644 (file)
@@ -1,3 +1,3 @@
 ---
 infra::additional_classes:
-  - accounts
\ No newline at end of file
+  - accounts
index 45b4bd1378564a070c82371b8a86e504b6e51e28..9bc2648672184a388342c0f4f5c12f41a73f0fde 100644 (file)
@@ -1,3 +1,3 @@
 ---
 infra::additional_classes:
-  - accounts
\ No newline at end of file
+  - accounts
index 7d9b23474c8424bf1e2917bc8b9bc01f7fde43fc..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-infra::role: base
\ No newline at end of file
+infra::role: base
index c577a269e2c9168d3153254e1bc5708775636c4b..e7b96f53657871bad5781497476c70dc5b59b8cc 100644 (file)
@@ -1,4 +1,3 @@
 ---
 infra::additional_classes:
   - pp_mcollective
-
index 03c1b0f2af7be56b73ea9b59005a570a2399dcf6..9bc2648672184a388342c0f4f5c12f41a73f0fde 100644 (file)
@@ -1,4 +1,3 @@
 ---
 infra::additional_classes:
   - accounts
-
index 12ba27e95842da42c57403e5df4edd3c1ef8d63f..543a5fd111b94634f26d8a66e45b8eefc076c415 100644 (file)
@@ -1,6 +1,6 @@
 ---
 infra::role: base
-#infra::additional_classes:
+# infra::additional_classes:
 #  - httpd
 #  - vivenio::app_server::tomcat
 #  - vivenio::webserver::apache
@@ -20,8 +20,7 @@ httpd::webserver:
       - 0.0.0.0:443
     extendedStatus: true
     worker: true
-    
-    
+
 vivenio::webserver::apache::host_servername: test-www-anmeldung-bmas-de.pixelpark.net
 vivenio::webserver::apache::ssl: true
 vivenio::webserver::apache::ssl_cert: /www/conf/certs/test-www-anmeldung-bmas-de.pixelpark.net
@@ -41,4 +40,4 @@ xymon::procs:
     text: Postgres Datenbank fuer Applikation
   java:
     color: red
-    text: Tomcat Java Applikation Vivenio
\ No newline at end of file
+    text: Tomcat Java Applikation Vivenio
index eaba450b736dd955659dfbafd6229cc69bcbbd95..3efe38dfd6347c80828f4f1a03528b2ed21f0d18 100644 (file)
@@ -2,4 +2,3 @@
 infra::additional_classes:
   - accounts
 #  - pp_mcollective
-
index eaba450b736dd955659dfbafd6229cc69bcbbd95..3efe38dfd6347c80828f4f1a03528b2ed21f0d18 100644 (file)
@@ -2,4 +2,3 @@
 infra::additional_classes:
   - accounts
 #  - pp_mcollective
-
index 3cd13b1b0728db6e7b78d1603e57b9060c1d23b6..68ec73581db7ac5559293a6a2f5a3eb8d5e2bd53 100644 (file)
@@ -1,3 +1,4 @@
+---
 accounts::users:
   jenkins:
     apply: true
index 211fe3448f415a5d137d71812cd8d1fcb141da5e..ff7c63c044e5dac4b03fc3485f2a88729b8536db 100644 (file)
@@ -1,6 +1,6 @@
 ---
 infra::role: base
-#infra::additional_classes:
+# infra::additional_classes:
 #  - httpd
 #  - vivenio
 #  - vivenio::app_server::tomcat
index e38c15e7a7fa1ecf7f64a16cd24df6fa7cef6e3e..209f9077603144ecc87b093b71d45d0e63bdfc73 100644 (file)
@@ -2,4 +2,3 @@
 infra::additional_classes:
   - accounts
   - pp_mcollective
-
index 521f17b176336e4fce601837b73d269c8cb045fd..42f05f8521417a9969c0938400750ac8bdf5de51 100644 (file)
@@ -23,7 +23,7 @@ accounts::users:
   matthias.schmidt:
     apply: true
   sylvia.egger:
-    apply: true      
+    apply: true
 
 sudo::configs:
   cmd_alias:
@@ -36,8 +36,7 @@ sudo::configs:
   becomeApache:
     priority: "07"
     content: |
-      jenkins ALL=(apache) NOPASSWD: ALL      
-
+      jenkins ALL=(apache) NOPASSWD: ALL
 
 nodejs::manage_package_repo: false
 
@@ -46,4 +45,4 @@ php::fpm::pools:
     ensure: absent
 
 xymon::disk_warnlevel: 80
-xymon::disk_paniclevel: 90
\ No newline at end of file
+xymon::disk_paniclevel: 90
index e24e7618c979b5998cc5c7fae589b9c87c33f055..f11aa2ddcacef5ae4da4e2660a4782bdabdd964d 100644 (file)
@@ -40,9 +40,9 @@ infra::profile::mysql_server::databases:
 
 infra::profile::typo3::projects:
   wissenschaftsjahr:
-    version: '7.6.18' # dummy value
+    version: '7.6.18'  # dummy value
     db_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAIKoLre5XPzsMdCxCfly4GcvxSmrx4XEXJ9+0p7UV1AjO6dwYOm8qhsWtodG0MwBYXaoKGqTaipeF7eCvsBuE0zNF1+07MOzCWgTwSrR6EIBUybr7Xc04PvoPQllMSvp1CfRGVBbYZ/JIZhtXuiGoP87MKwa0BlIFO+1gXIu+5AFsFpraFeZnB1hmFnsHBJfK/utGmONA1w2hrsYLVnMJ0WO/mubwmKJE92Im7i/1kHXCc+6aVyICGfD+E9On2Ktlq0F8JOoE3CJT/wqryNNSwCb672gTaZYl1UUVBh8wVXK1rByiXOxUMRLgJb6FGQdMNuKwaOf4yhYstSv0tZwsCDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBePGMowQ3L7+7Kk/VI0/UegCC04jr6cPSBijavVA6vwj1e2q2hFqg+lnXh7tX37eMZCA==]
-    manage_typo3_project: false # on-top vhost for all wissenschaftsjahr vhosts
+    manage_typo3_project: false  # on-top vhost for all wissenschaftsjahr vhosts
     servername: test-web02-bmbf.pixelpark.net
     fallbackresource: '/2016-17/service/seite-nicht-gefunden.html'
     error_documents:
@@ -87,7 +87,7 @@ infra::profile::typo3::projects:
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
-    minute: '*' # jede Minute Cron Job
+    minute: '*'  # jede Minute Cron Job
     directories:
       - location1:
         provider: location
@@ -107,7 +107,7 @@ infra::profile::typo3::projects:
       post_max_size: '50M'
       upload_max_filesize: '50M'
 
-infra::profile::flow::manage_php: false # managed by typo3
+infra::profile::flow::manage_php: false  # managed by typo3
 infra::profile::flow::projects:
   wissen-flow:
     version: '3.2.2'
@@ -119,7 +119,7 @@ infra::profile::flow::projects:
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     user: service.typo3
-    setflow_context: false # we overwrite the default flow context
+    setflow_context: false  # we overwrite the default flow context
     setenv:
       - 'FLOW_CONTEXT Development'
 
index 05c283381a45d4ba79263b3b102a534b187ff79b..ec6750131275dfbf629fc70467742351ffca4c1c 100644 (file)
@@ -25,7 +25,7 @@ mysql::server::override_options:
     innodb_log_buffer_size: 16M
     query_cache_type: 0
     default-storage-engine: INNODB
-    innodb_file_per_table: ON
+    innodb_file_per_table: 'ON'
 
 infra::profile::apache::htdigest:
   server:
@@ -48,9 +48,9 @@ infra::profile::mysql_server::databases:
 
 infra::profile::typo3::projects:
   wissenschaftsjahr:
-    version: '7.6.18' # dummy value
+    version: '7.6.18'  # dummy value
     db_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmL6L4Gjwh2CJn7VR3nggYsGrUWGfCc5wyqDENDoN0hpZY3/Z5KYXwqxmgYzYrJQDcz4y7MtqsVaJa43RQNxFvMHm/u0MBq5Lj3gFXiCwERl4iGS2cjC9p64kCB9DygN4SshQb1LssGO08vKi9o3PLPIbu3x2L/f3ntBlh3C7Z1sGnXJTRt1vDPmnennadDpPXPBr1YXO+PjDHPM2aYmK1ObNUSJuj+aSVoO+39/MbKItu1PWGxun8t4LYOJeVX9UO0dRaKe+Jb5Y2n1Pi9ehM4CFh2GGntRhpxKLzSRpVB+7pbw0t4+L9opWlYWYuGegEV30QXgHIjwqGjL4LPL/kjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCGcbqulPE0TFeB6SkB8sOegCCz5uvjwlpS1tq7H1lDffHfCR2OAw8M0xmWWHwJQpSJ6w==]  # dummy value
-    manage_typo3_project: false # on-top vhost for all wissenschaftsjahr vhosts
+    manage_typo3_project: false  # on-top vhost for all wissenschaftsjahr vhosts
     servername: www.wissenschaftsjahr.de
     serveraliases:
       - wissenschaftsjahr.de
@@ -141,7 +141,7 @@ infra::profile::typo3::projects:
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
-    minute: '*' # jede Minute Cron Job
+    minute: '*'  # jede Minute Cron Job
     directories:
       - location1:
         provider: location
@@ -175,7 +175,7 @@ infra::profile::typo3::projects:
       post_max_size: '50M'
       upload_max_filesize: '50M'
 
-infra::profile::flow::manage_php: false # managed by typo3
+infra::profile::flow::manage_php: false  # managed by typo3
 infra::profile::flow::projects:
   wissen-flow:
     version: '3.2.2'
@@ -187,7 +187,7 @@ infra::profile::flow::projects:
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     user: service.typo3
-    setflow_context: false # we overwrite the default flow context
+    setflow_context: false  # we overwrite the default flow context
     setenv:
       - 'FLOW_CONTEXT Development'
 
index ac602edfe50538681932663a44e9166691517554..e8fe4f6e1c88f559c4d7f4065db88fff2a4ec7cd 100644 (file)
@@ -29,7 +29,7 @@ sudo::configs:
     priority: "06"
     content: |
       jenkins ALL=(apache) NOPASSWD: ALL
-    
+
 infra::role: base
 infra::additional_classes:
   - infra::profile::typo3
index 4d1a2bbb44e6f2dc6cb203e6baa19974b11ce09f..09bd7c1bff746e9204d47b0b223eb044bf1176a7 100644 (file)
@@ -73,10 +73,10 @@ infra::profile::typo3::projects:
       alias: '/logs'
       path: '/var/log/httpd'
     access_log_format: urchinpp_xf4
-    ssl_real: false # because we are behind lb
-#    ssl_cert: '/etc/pki/tls/certs/www.bundeshaushalt-info.de-cert.pem'
-#    ssl_key: '/etc/pki/tls/private/www.bundeshaushalt-info.de-key.pem'
-#    ssl_chain: '/etc/pki/tls/certs/www.bundeshaushalt-info.de-cert.pem'
+    ssl_real: false  # because we are behind lb
+    #    ssl_cert: '/etc/pki/tls/certs/www.bundeshaushalt-info.de-cert.pem'
+    #    ssl_key: '/etc/pki/tls/private/www.bundeshaushalt-info.de-key.pem'
+    #    ssl_chain: '/etc/pki/tls/certs/www.bundeshaushalt-info.de-cert.pem'
     directories:
       - directory2:
         provider: directory
index e60f2576f5542fb35e57195438c2319ba85edef9..cd0a30beba3b059bf73f02ab63b047a811681f3f 100644 (file)
@@ -35,7 +35,7 @@ sudo::configs:
   becomeApache:
     priority: "06"
     content: |
-      jenkins ALL=(apache) NOPASSWD: ALL    
+      jenkins ALL=(apache) NOPASSWD: ALL
 
 infra::role: base
 infra::additional_classes:
index ce030b25b9877294c1d85bb3a0828d983bab9f2c..956a70b0ee5bc3cac526ba0d412e87127c36f81e 100644 (file)
@@ -74,7 +74,7 @@ infra::profile::drupal::projects:
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_chain: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
-    #directories:
+    # directories:
     #  - location1:
     #    provider: location
     #    path: '/'
index 30907db9910869ef8cdd0882745c8368438bdb19..5921610c20f1a44dfcc619aafdbfb4660287a7fe 100644 (file)
@@ -1,13 +1,14 @@
 ---
 infra::role: base
+
 infra::additional_classes:
-#  - infra::profile::galera_cluster
-#  - infra::profile::mysql_server
+  #  - infra::profile::galera_cluster
+  #  - infra::profile::mysql_server
   - logstash
 
 mysql::server::override_options:
   mysqld:
-    innodb_file_per_table: ON
+    innodb_file_per_table: 'ON'
 
 mysql::server::backup::backupdir: /var/lib/backup/mysql
 
index 30907db9910869ef8cdd0882745c8368438bdb19..9faec8584b3aca49a9aa65f89ad10a987e1fdb96 100644 (file)
@@ -1,13 +1,13 @@
 ---
 infra::role: base
 infra::additional_classes:
-#  - infra::profile::galera_cluster
-#  - infra::profile::mysql_server
+  #  - infra::profile::galera_cluster
+  #  - infra::profile::mysql_server
   - logstash
 
 mysql::server::override_options:
   mysqld:
-    innodb_file_per_table: ON
+    innodb_file_per_table: 'ON'
 
 mysql::server::backup::backupdir: /var/lib/backup/mysql
 
index 9d185c4ecd4525a3be871132769f4a63206302b9..1b2ea87d6ef3e7cbd68d4b4de1debc739ae2ec90 100644 (file)
@@ -1,7 +1,7 @@
 ---
 infra::role: base
-#infra::additional_classes: #disabled until merge of https://github.com/puppetlabs/puppetlabs-mysql/pull/920
-  #- infra::profile::mysql_server # disabled until merge of https://github.com/puppetlabs/puppetlabs-mysql/pull/920
+# infra::additional_classes: #disabled until merge of https://github.com/puppetlabs/puppetlabs-mysql/pull/920
+- infra::profile::mysql_server # disabled until merge of https://github.com/puppetlabs/puppetlabs-mysql/pull/920
 
 mysql::server::override_options:
   mysqld:
index 30907db9910869ef8cdd0882745c8368438bdb19..9faec8584b3aca49a9aa65f89ad10a987e1fdb96 100644 (file)
@@ -1,13 +1,13 @@
 ---
 infra::role: base
 infra::additional_classes:
-#  - infra::profile::galera_cluster
-#  - infra::profile::mysql_server
+  #  - infra::profile::galera_cluster
+  #  - infra::profile::mysql_server
   - logstash
 
 mysql::server::override_options:
   mysqld:
-    innodb_file_per_table: ON
+    innodb_file_per_table: 'ON'
 
 mysql::server::backup::backupdir: /var/lib/backup/mysql
 
index 7d9b23474c8424bf1e2917bc8b9bc01f7fde43fc..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-infra::role: base
\ No newline at end of file
+infra::role: base
index 9e46038230b7c410a3f35cf9c1296cf189986dcc..b8da8de866c76898379cc076565ba3f969b93e06 100644 (file)
@@ -41,4 +41,4 @@ infra::profile::mysql_server::databases:
     user: ADMINPORTAL
     password: hee3eeK4Gouyii5a
     host: '%'
-mysql::server::backup::backupdir: /var/lib/backup/mysql
\ No newline at end of file
+mysql::server::backup::backupdir: /var/lib/backup/mysql
index 7d9b23474c8424bf1e2917bc8b9bc01f7fde43fc..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-infra::role: base
\ No newline at end of file
+infra::role: base
index e41baf30c0159a829e501ccdf1dac354e5629cfb..3e1626bacbdb4ce21fbe6b34f7f90a686a604442 100644 (file)
@@ -10,8 +10,8 @@ sudo::configs:
       jenkins ALL=(ALL) NOPASSWD: ALL
 
 infra::role: base
-#infra::additional_classes: # disabled until merge of https://github.com/puppetlabs/puppetlabs-mysql/pull/920
-  #- infra::profile::mysql_server  # disabled until merge of https://github.com/puppetlabs/puppetlabs-mysql/pull/920
+# infra::additional_classes: # disabled until merge of https://github.com/puppetlabs/puppetlabs-mysql/pull/920
+- infra::profile::mysql_server  # disabled until merge of https://github.com/puppetlabs/puppetlabs-mysql/pull/920
 
 mysql::server::override_options:
   mysqld:
index 7d9b23474c8424bf1e2917bc8b9bc01f7fde43fc..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-infra::role: base
\ No newline at end of file
+infra::role: base
index bdebbb25ae41c8aff1c0e17ca0f7518d60d33183..1219043a41585eb05fdd562dd090cbb9cdc7de45 100644 (file)
@@ -1,15 +1,15 @@
 ---
 infra::role: base
 infra::additional_classes:
-#  - infra::profile::galera_cluster
-#  - infra::profile::mysql_server
+  #  - infra::profile::galera_cluster
+  #  - infra::profile::mysql_server
   - logstash
 
 galera::repo::yum_mariadb_baseurl: "http://repo.pixelpark.com/Linux/yum/mariadb/10.1/centos/%{operatingsystemmajrelease}/%{architecture}/"
 
 infra::profile::galera_cluster::override_options:
   mysqld:
-    innodb_file_per_table: ON
+    innodb_file_per_table: 'ON'
     wait_timeout: '600'
     interactive_timeout: '600'
     max_allowed_packet: '128M'
index bdebbb25ae41c8aff1c0e17ca0f7518d60d33183..1219043a41585eb05fdd562dd090cbb9cdc7de45 100644 (file)
@@ -1,15 +1,15 @@
 ---
 infra::role: base
 infra::additional_classes:
-#  - infra::profile::galera_cluster
-#  - infra::profile::mysql_server
+  #  - infra::profile::galera_cluster
+  #  - infra::profile::mysql_server
   - logstash
 
 galera::repo::yum_mariadb_baseurl: "http://repo.pixelpark.com/Linux/yum/mariadb/10.1/centos/%{operatingsystemmajrelease}/%{architecture}/"
 
 infra::profile::galera_cluster::override_options:
   mysqld:
-    innodb_file_per_table: ON
+    innodb_file_per_table: 'ON'
     wait_timeout: '600'
     interactive_timeout: '600'
     max_allowed_packet: '128M'
index bdebbb25ae41c8aff1c0e17ca0f7518d60d33183..1219043a41585eb05fdd562dd090cbb9cdc7de45 100644 (file)
@@ -1,15 +1,15 @@
 ---
 infra::role: base
 infra::additional_classes:
-#  - infra::profile::galera_cluster
-#  - infra::profile::mysql_server
+  #  - infra::profile::galera_cluster
+  #  - infra::profile::mysql_server
   - logstash
 
 galera::repo::yum_mariadb_baseurl: "http://repo.pixelpark.com/Linux/yum/mariadb/10.1/centos/%{operatingsystemmajrelease}/%{architecture}/"
 
 infra::profile::galera_cluster::override_options:
   mysqld:
-    innodb_file_per_table: ON
+    innodb_file_per_table: 'ON'
     wait_timeout: '600'
     interactive_timeout: '600'
     max_allowed_packet: '128M'
index 7d9b23474c8424bf1e2917bc8b9bc01f7fde43fc..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-infra::role: base
\ No newline at end of file
+infra::role: base
index 7d9b23474c8424bf1e2917bc8b9bc01f7fde43fc..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-infra::role: base
\ No newline at end of file
+infra::role: base
index 7d9b23474c8424bf1e2917bc8b9bc01f7fde43fc..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-infra::role: base
\ No newline at end of file
+infra::role: base
index 7d9b23474c8424bf1e2917bc8b9bc01f7fde43fc..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,2 +1,2 @@
 ---
-infra::role: base
\ No newline at end of file
+infra::role: base
index 3cd13b1b0728db6e7b78d1603e57b9060c1d23b6..68ec73581db7ac5559293a6a2f5a3eb8d5e2bd53 100644 (file)
@@ -1,3 +1,4 @@
+---
 accounts::users:
   jenkins:
     apply: true
index de69def1f4b556d4b438fb38910736e76ab9eec4..5cffc99b87addecf3c64f0f1ef8d5b169e4b9a44 100644 (file)
@@ -42,11 +42,11 @@ infra::profile::typo3::projects:
       - grwo4:
         comment: 'Ueber die Gruenderwoche'
         rewrite_rule:
-          -  ^/ueber/index.php$ https://www.gruenderwoche.de/ueber-die-gruenderwoche/ [R=301,L]
+          - ^/ueber/index.php$ https://www.gruenderwoche.de/ueber-die-gruenderwoche/ [R=301,L]
       - grwo5:
         comment: 'Partnerbereich'
         rewrite_rule:
-          -  ^/partner/partnerbereich/index.php$ https://www.gruenderwoche.de/partnerbereich/ [R=301,L]
+          - ^/partner/partnerbereich/index.php$ https://www.gruenderwoche.de/partnerbereich/ [R=301,L]
       - grwo6:
         comment: 'Fuer Partner und Foerderer'
         rewrite_rule:
@@ -78,11 +78,11 @@ infra::profile::typo3::projects:
       - grwo13:
         comment: 'Ansprechpartner'
         rewrite_rule:
-          -  ^/partner/ansprechpartner/index.php$ https://www.gruenderwoche.de/service/ansprechpartner/ [R=301,L]
+          - ^/partner/ansprechpartner/index.php$ https://www.gruenderwoche.de/service/ansprechpartner/ [R=301,L]
       - grwo14:
         comment: 'Als Partner registrieren'
         rewrite_rule:
-          -  ^/partner/registrierung.php$ https://www.gruenderwoche.de/fuer-partner-und-foerderer/als-partner-registrieren/ [R=301,L]
+          - ^/partner/registrierung.php$ https://www.gruenderwoche.de/fuer-partner-und-foerderer/als-partner-registrieren/ [R=301,L]
       - grwo15:
         comment: 'Veranstaltungsideen'
         rewrite_rule:
index 88a656020d8e8adf9b180a3c6d80f844e208c7e4..b56c6b5b5e66003b733dbd3cd34119d7efb4b8aa 100644 (file)
@@ -9,7 +9,7 @@ infra::profile::mysql_server::databases:
 
 php::dev: true
 php::pear: true
-apache::timeout: 1800 # temporary for migration
+apache::timeout: 1800  # temporary for migration
 infra::profile::apache::htdigest:
   server:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAL/9BZJBKMne3z5KC9A3kUCz1LrvEteRUPnwkQiz+qT9YhZDfMQCASZ4e0ylxB4T/55XM60ajDai22y2gPq4jDdMqFLeWYQy+1WS4kpeMTf465KuWrxAQUtVFEBM+PQe53+4USr7KSVUofufOA+UCCb01yQIfN6QPxRMij9rcCjRU0fhbtANkOGxQyzm26ECTPlTBjaOl8+Eaa5Z0CMs0Y/O7KzoawbWPRe7ESd2CN4Ooyabn1rrgMCzQeVfZ9WqCIKfhYGaFTQX/X7QHOXwYyMJJdwAEw2GDUecbE2dG0U0no1uzth4MfoPiPTvxhbg3otLpbSVBOt9rxYH0XxxLujBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAK+e31GjupB7aqXOrl4zvdgCCnwwYIL195PyxzFkEvC+Nnft9rdjC0JQSTNH57MKmQWg==]
index bf42d7b694f0b80f676330eb71dbc267b3ad0b13..96a724bc64519e82d39ff783d6d1ebd1fb5e09d9 100644 (file)
@@ -1,5 +1,5 @@
 ---
-infra::role: base_for_old_systems # because we don't need xymon
+infra::role: base_for_old_systems  #  because we don't need xymon
 infra::additional_classes:
   - accounts
 accounts::users:
index bf42d7b694f0b80f676330eb71dbc267b3ad0b13..96a724bc64519e82d39ff783d6d1ebd1fb5e09d9 100644 (file)
@@ -1,5 +1,5 @@
 ---
-infra::role: base_for_old_systems # because we don't need xymon
+infra::role: base_for_old_systems  #  because we don't need xymon
 infra::additional_classes:
   - accounts
 accounts::users:
index 03c1b0f2af7be56b73ea9b59005a570a2399dcf6..9bc2648672184a388342c0f4f5c12f41a73f0fde 100644 (file)
@@ -1,4 +1,3 @@
 ---
 infra::additional_classes:
   - accounts
-
index bf42d7b694f0b80f676330eb71dbc267b3ad0b13..96a724bc64519e82d39ff783d6d1ebd1fb5e09d9 100644 (file)
@@ -1,5 +1,5 @@
 ---
-infra::role: base_for_old_systems # because we don't need xymon
+infra::role: base_for_old_systems  #  because we don't need xymon
 infra::additional_classes:
   - accounts
 accounts::users:
index a86ae86de67547284e1baefc58a37fb7277120aa..a59883115a865e6c0da404836fd443b40f17e5c7 100644 (file)
@@ -3,4 +3,3 @@ infra::role: base
 infra::additional_classes:
   - accounts
   - pp_mcollective
-
index 1a29cf47ab67881405c34daee30339750a7bc9ca..77bd9249fefa61c2fd19e02fee1629fb1f90cc87 100644 (file)
@@ -1,13 +1,13 @@
 ---
 infra::role: base
 
-#infra::additional_classes:
+# infra::additional_classes:
 #  - logstash
 
 logstash::generic_resource:
   catalina:
     resource: file
-    order: 10 # Input
+    order: 10  #  Input
     parameters:
       path: '/opt/gsb/active/rls-tomcat/logs/catalina.out'
       type: catalina-tomcat
@@ -16,7 +16,7 @@ logstash::generic_resource:
         - "%{customer}"
   webapp:
     resource: file
-    order: 10 # Input
+    order: 10  #  Input
     parameters:
       path: '/opt/gsb/active/rls-tomcat/logs/webapp-replicationliveserver.log'
       type: webapp
index bf42d7b694f0b80f676330eb71dbc267b3ad0b13..96a724bc64519e82d39ff783d6d1ebd1fb5e09d9 100644 (file)
@@ -1,5 +1,5 @@
 ---
-infra::role: base_for_old_systems # because we don't need xymon
+infra::role: base_for_old_systems  #  because we don't need xymon
 infra::additional_classes:
   - accounts
 accounts::users:
index bf42d7b694f0b80f676330eb71dbc267b3ad0b13..96a724bc64519e82d39ff783d6d1ebd1fb5e09d9 100644 (file)
@@ -1,5 +1,5 @@
 ---
-infra::role: base_for_old_systems # because we don't need xymon
+infra::role: base_for_old_systems  #  because we don't need xymon
 infra::additional_classes:
   - accounts
 accounts::users:
index a203e2c8df92c44275e2bcf34511bb5568683f4e..09e770b1bba6cdb3dc163b6b8cb9c4d5adc603e3 100644 (file)
@@ -5,7 +5,6 @@ mailman::site_pw: 'CHANGEME'
 mailman::language: 'en'
 mailman::mta: 'Postfix'
 mailman::smtp_max_rcpts: '50'
-mailman::enable_service: true
 
 httpd::webserver:
   test-listserv-bmwi-de-tmp.pixelpark.net:
@@ -14,4 +13,4 @@ httpd::webserver:
 
 xymon::disks:
   '/boot':
-    ignore: true
\ No newline at end of file
+    ignore: true
index 3cd13b1b0728db6e7b78d1603e57b9060c1d23b6..68ec73581db7ac5559293a6a2f5a3eb8d5e2bd53 100644 (file)
@@ -1,3 +1,4 @@
+---
 accounts::users:
   jenkins:
     apply: true
index c90ec476aad915d4a05de6a97939c2082daea259..3b0442d3c925d4f4820fbb228ffd4a4ad755de38 100644 (file)
@@ -1,3 +1,2 @@
 ---
 infra::role: base
-
index 28c2d3010088187fcbaf8ff39e08adf4065e2867..c84a9f5bf19c0646cbe3638587548c28474ba626 100644 (file)
@@ -17,4 +17,4 @@ php::extensions:
 
 php::fpm::pools:
   www:
-    ensure: absent
\ No newline at end of file
+    ensure: absent
index 3b349ebf96ea3942efeaad580b291ba696e904cb..48621b38f018dfda9f0e0c8ce1c4e71c9f06ebb4 100644 (file)
@@ -18,4 +18,3 @@ mysql::server::override_options:
     log-bin: 'binlog'
     binlog-format: 'MIXED'
     binlog-ignore-db: 'performance_schema, information_schema'
-
index 9958b126ff7e889b938c17907f8c9b2618954beb..23462f62475ad6ee3fe056eed152d975d9fc987f 100644 (file)
@@ -12,11 +12,11 @@ zookeeper::servers:
 solr::version: 6.3.0
 solr::cloud: true
 solr::cloudmembers:
-   - search01-buschjaeger-de.pixelpark.net:2181
-   - search02-buschjaeger-de.pixelpark.net:2181
-   - search03-buschjaeger-de.pixelpark.net:2181
-   - search04-buschjaeger-de.pixelpark.net:2181
-# We create empty core,because we get Config from Zookeeper, Read https://intra.pixelpark.com/confluence/x/khd1Ag how to move config files to zookeeper
+  - search01-buschjaeger-de.pixelpark.net:2181
+  - search02-buschjaeger-de.pixelpark.net:2181
+  - search03-buschjaeger-de.pixelpark.net:2181
+  - search04-buschjaeger-de.pixelpark.net:2181
+  # We create empty core,because we get Config from Zookeeper, Read https://intra.pixelpark.com/confluence/x/khd1Ag how to move config files to zookeeper
 solr::cores:
   german: {}
   austrian: {}
@@ -69,7 +69,7 @@ infra::profile::typo3::projects:
       - busch-jaeger.de
       - www.busch-jaeger.com
       - busch-jaeger.com
-    # Pixelpark Aliase
+      #  Pixelpark Aliase
       - web-buschjaeger-de.pixelpark.net
       - web01-buschjaeger-de.pixelpark.net
       - web02-buschjaeger-de.pixelpark.net
index bf8f21a4de0348f5f8f16ef0661e1a333bc50579..4ea92607a31f6b0efd6faa9cf2b2ff72f6c36b19 100644 (file)
@@ -36,7 +36,7 @@ accounts::users:
     apply: true
 
 ### SFTP Accounts ###
-#infra::profile::apache::pp_vhosts:
+# infra::profile::apache::pp_vhosts:
 #  update.busch-jaeger.de:
 #    ip: 93.188.107.176
 #    docroot: '/var/www/html/update.busch-jaeger.de'
index 8c43797a8462594defbadb61d6f5d48440d5746e..aa25d7fc906beb446ce5c972396c5d30ee324c96 100644 (file)
@@ -36,7 +36,7 @@ accounts::users:
     apply: true
 
 ### SFTP Accounts ###
-#infra::profile::apache::pp_vhosts:
+# infra::profile::apache::pp_vhosts:
 #  update.busch-jaeger.de:
 #    ip: 93.188.107.177
 #    docroot: '/var/www/html/update.busch-jaeger.de'
index a940ec645e00a778fe8b239fee7d3ad24e27f544..fea40440164d3dfe62d4b9356ca7f4c1064063e3 100644 (file)
@@ -1,15 +1,15 @@
 ---
-infra::role: base_for_old_systems # because we don't need xymon
+infra::role: base_for_old_systems  # because we don't need xymon
 infra::additional_classes:
   - accounts
-# Disable because of extra 7.3 download path
-#  - repo::redhat::zfs
+  # Disable because of extra 7.3 download path
+  #  - repo::redhat::zfs
   - infra::profile::aem::author
 
 infra::profile::cron::cronjobs:
   zfs_rotation:
     user: root
-    command: '/usr/local/sbin/zfs_rotation.sh datapool 2592000' # 30 days
+    command: '/usr/local/sbin/zfs_rotation.sh datapool 2592000'  # 30 days
     minute: 0
     hour: 2
-    description: ZFS Snapshot
\ No newline at end of file
+    description: ZFS Snapshot
index c0122885ef4a69b9d5bdec3546da77b188e272cf..cea4c570304185443ed53f2c9890ea65005cc799 100644 (file)
@@ -27,7 +27,7 @@ apache::mod::deflate::types:
   - 'application/x-javascript application/javascript application/ecmascript'
   - 'application/rss+xml'
   - 'application/json'
-  - 'image/svg+xml' # new
+  - 'image/svg+xml'  # new
 
 apache::log_formats:
   lb_combined: '%%{ich-trickse}{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%%{ich-trickse}{Referer}i\" \"%%{ich-trickse}{User-Agent}i\"'
index bf4b75b4f4b9de38a85392e0f980372a95b7cf6e..e775018548ab86ac3813f7c1ac2218352519aecd 100644 (file)
@@ -1,4 +1,4 @@
 ---
 
 epel::epel_baseurl: "https://repo.pixelpark.com/Linux/yum/epel/%{operatingsystemmajrelease}/$basearch"
-epel::epel_mirrorlist: absent
\ No newline at end of file
+epel::epel_mirrorlist: absent
index 56f4ad0d02c0e2f50026548702c1290cb77b95f3..19fa17c445bd7ec2afbcdeb83c30f266ae4c53a4 100644 (file)
@@ -1,3 +1,4 @@
+---
 mcollective::connector: rabbitmq
 mcollective::securityprovider: ssl
 mcollective::classesfile: "%{puppet_vardir}/state/classes.txt"
@@ -11,4 +12,3 @@ mcollective::ssl_server_public: puppet:///mco_dir/mcollective-servers-cert.pem
 mcollective::ssl_server_private: puppet:///mco_dir/mcollective-servers-key.pem
 mcollective::ssl_client_certs: puppet:///mco_dir/clients
 mcollective::core_libdir: '/usr/libexec/mcollective'
-  
\ No newline at end of file
index 4ece233c54a6fd2e26bedc189185dda1d4dc4f28..b29fcbb5adc4364d96e5e504046350c2f836ef87 100644 (file)
@@ -1,15 +1,11 @@
 ---
-
 mysql::server::remove_default_accounts: true
-
-
 mysql::server::backup::backupuser: backup
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAp0L8xZAUtkyTLd/sptQP3QbzlR6T9GzTCIGonIBXYu7SlGh305KKCt8yUDtd2Wp0uJe/JMAfpJ091wEWV82hgpQarwGCWSIpG+JfewvnMnWlu1VCe5kPhisBZHM0iAzuJblsjDpVhpHxhXujKDlY7O7IsUpE/zNjN/tT+IhKXeQNaoM4pRgtzd21YDDTz6+Tz4rMH4nxdqK2BS1tu13GgqAh2siZzmgNRUQe9ZnUHLVRB6plYSDSMngF3CjdVWIs9r2JgVSdbVUJX/xRWhn0+qtTGsKz9loT2PflbtuLGINyts4WNXhZbTVI8K3I7UlQjBHP0ampUI1Kl8JqMBDdHDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBClJspHN3EpItpDsGEju9gbgCA2k6Xo8WRJKk1cjU8cru/Tihi+FCGEnT4eI7F1+GstuA==]
 mysql::server::backup::backupdir: /srv/backup/mysql
 mysql::server::backup::backuprotate: 3
 mysql::server::backup::maxallowedpacket: '512M'
-
 mysql::server::backup::file_per_database: true
 mysql::server::backup::time:
   - '21'
-  - '30'
\ No newline at end of file
+  - '30'
index d16258f66e96ac6888233dfa216b851fca15b438..5a3fa9fe6de3696ad2160e2d2ae7f3fbe9400c76 100644 (file)
@@ -2,4 +2,4 @@
 ntp::servers:
   - time01.pixelpark.com
   - time02.pixelpark.com
-  - time03.pixelpark.com
\ No newline at end of file
+  - time03.pixelpark.com
index 05f05cf3440dfb0e5247162ec58728f6cb85bee8..0a790cd781882dd5c8793e09f6f5aaee062e05d7 100644 (file)
@@ -6,4 +6,4 @@ php::settings:
 php::manage_repos: false
 php::dev: false
 php::composer: false
-php::pear: false
\ No newline at end of file
+php::pear: false
index 5c6ebe787ea8f621089fb631a2e52393c7e620bf..2a7fe079f71e1d249a13b5fe15db2566ebdb7b53 100644 (file)
@@ -27,4 +27,4 @@ repo::redhat::centos::base_baseurl: 'https://repo.pixelpark.com/Linux/yum/centos
 repo::redhat::centos::updates_baseurl: 'https://repo.pixelpark.com/Linux/yum/centos/$releasever/updates/$basearch/'
 repo::redhat::centos::extra_baseurl: 'https://repo.pixelpark.com/Linux/yum/centos/$releasever/extras/$basearch/'
 
-repo::redhat::passenger::baseurl: 'https://repo.pixelpark.com/Linux/yum/phusionpassenger/el/$releasever/$basearch'
\ No newline at end of file
+repo::redhat::passenger::baseurl: 'https://repo.pixelpark.com/Linux/yum/phusionpassenger/el/$releasever/$basearch'
index 410084462e2d5e49fd8f783ab97844ee5daf6677..e6932b69bdc7627f35211f512ba75109dc831af3 100644 (file)
@@ -1,2 +1,2 @@
 ---
-rvm::key_server: 'hkp://keys.gnupg.net:80'
\ No newline at end of file
+rvm::key_server: 'hkp://keys.gnupg.net:80'
index 97ba37b3a3aeeec5d04952031a1d572a1775b591..21d89993661593c3a809a160425bf62d1e59534a 100644 (file)
@@ -6,4 +6,4 @@ zabbix::agent::serveractive: 217.66.51.48
 
 # Fix some versions
 zabbix::repo::zabbix_version: 2.4
-zabbix::agent::zabbix_version: 2.4
\ No newline at end of file
+zabbix::agent::zabbix_version: 2.4