]> Frank Brehm's Git Trees - pixelpark/hiera.git/commitdiff
Revert "bmas: sgb2 web02 entfernt"
authorPhilipp Dallig <philipp.dallig@pixelpark.com>
Tue, 4 Oct 2016 16:15:54 +0000 (18:15 +0200)
committerPhilipp Dallig <philipp.dallig@pixelpark.com>
Tue, 4 Oct 2016 16:15:54 +0000 (18:15 +0200)
This reverts commit cf5368b14393ff82483221a8429f6fbf34475c2c.

customer/bmas-sgb2/test-web02-sgb2-info.pixelpark.net.yaml [new file with mode: 0644]
customer/bmas-sgb2/web02-sgb2-info.pixelpark.net.yaml [new file with mode: 0644]

diff --git a/customer/bmas-sgb2/test-web02-sgb2-info.pixelpark.net.yaml b/customer/bmas-sgb2/test-web02-sgb2-info.pixelpark.net.yaml
new file mode 100644 (file)
index 0000000..0d22e2b
--- /dev/null
@@ -0,0 +1,47 @@
+---
+# CentOS 6.7
+site::role: base
+site::additional_classes:
+  - site::profile::apache
+  - apache::mod::php
+site::additional_packages:
+  php-gd: {}
+  php-mbstring: {}
+  php: {}
+  php-mysql: {}
+  php-drush-drush: {}
+
+# www.sgb2.info
+site::profile::apache::pp_vhosts:
+  www.sgb2.info:
+    servername: test-www-sgb2-info.pixelpark.net
+    docroot: '/srv/www/www.sgb2.info'
+    ssl: true
+    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:
+      - root_directory:
+        provider: directory
+        path: '/srv/www/www.sgb2.info'
+        options:
+          - FollowSymLinks
+        allow_override:
+          - All
+      - 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'
+#    rewrites_non_ssl:
+#      - http_to_https:
+#        comment: 'Alles auf https umleiten'
+#        rewrite_rule:
+#          - ^(.*)$  https://www.sgb2.info$1  [R=301,L]
+    proxy_pass:
+      - { path: /statistik, url: 'http://test-web01-sgb2-info.pixelpark.net:8080/statistik' }
+      - { path: /Freibetragsrechner, url: 'http://test-web01-sgb2-info.pixelpark.net:8080/Freibetragsrechner' }
diff --git a/customer/bmas-sgb2/web02-sgb2-info.pixelpark.net.yaml b/customer/bmas-sgb2/web02-sgb2-info.pixelpark.net.yaml
new file mode 100644 (file)
index 0000000..822a20d
--- /dev/null
@@ -0,0 +1,112 @@
+---
+# CentOS 6.7
+site::role: base
+site::additional_classes:
+  - site::profile::apache
+  - apache::mod::php
+site::additional_packages:
+  php-gd: {}
+  php-mbstring: {}
+  php: {}
+  php-mysql: {}
+  php-drush-drush: {}
+
+apache::mod::prefork::maxspareservers: 5
+apache::mod::prefork::serverlimit: 20
+apache::mod::prefork::maxclients: 20
+
+apache::default_vhost: false
+
+# www.sgb2.info
+site::profile::apache::pp_vhosts:
+  www.sgb2.info:
+    servername: www.sgb2.info
+    serveraliases:
+      - sgb2.info
+      - xn--frdern-und-fordern-d3b.info
+      - www.xn--frdern-und-fordern-d3b.info
+      - foerdern-und-fordern.info
+      - www.foerdern-und-fordern.info
+      - hartziv.de
+      - www.hartziv.de
+      - jobcentersuche.de
+      - www.jobcentersuche.de
+      - arbeitsmarktreform.de
+      - www.arbeitsmarktreform.de
+      - www-sgb2-info.pixelpark.net
+    docroot: '/srv/www/www.sgb2.info'
+    ip: 77.74.236.164
+    ssl: true
+    ssl_cert: /etc/pki/tls/certs/www.sgb2.info-cert.pem
+    ssl_chain: /etc/pki/tls/certs/www.sgb2.info-cert.pem
+    ssl_key: /etc/pki/tls/private/www.sgb2.info-key.pem
+    directories:
+      - root_directory:
+        provider: directory
+        path: '/srv/www/www.sgb2.info'
+        options:
+          - FollowSymLinks
+        allow_override:
+          - All
+#      - 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'
+#    rewrites_non_ssl:
+#      - http_to_https:
+#        comment: 'Alles auf https umleiten'
+#        rewrite_rule:
+#          - ^(.*)$  https://www.sgb2.info$1  [R=301,L]
+    rewrites_ssl:
+      - alias:
+        comment: 'Alle Aliase auf Servername'
+        rewrite_cond: 
+          - '%%{ich-trickse}{HTTP_HOST} !^www\.sgb2\.info$ [NC]'
+        rewrite_rule: 
+          - '^(.*)$ https://www.sgb2.info$1 [L,R=301]'
+    rewrites:
+      - gemeinsame-planungsdokumente:
+        comment: BMASSGBZWEI-48
+        rewrite_rule:
+          - ^/seite/gemeinsame-planungsdokumente$ https://www.sgb2.info/sites/default/files/inlineFiles/files/gemeinsame_planungsgrundlagen_der_zielsteuerung_im_sgb_ii_fur_das_jahr_2016.pdf [R=301,L]
+    proxy_pass:
+      - { path: /statistik, url: 'http://web01-sgb2-info.pixelpark.net:8080/statistik' }
+      - { path: /Freibetragsrechner, url: 'http://web01-sgb2-info.pixelpark.net:8080/Freibetragsrechner' }
+  sgb2-kennzahlen:
+    servername: www.sgb2-kennzahlen.de
+    serveraliases:
+      - sgb2-kennzahlen.de
+      - www-sgb2-kennzahlen-de.pixelpark.net
+    docroot: '/srv/www/www.sgb2.info'
+    ip: 77.74.236.167
+    ssl: true
+    ssl_cert: /etc/pki/tls/certs/www.sgb2-kennzahlen.de-cert.pem
+    ssl_chain: /etc/pki/tls/certs/www.sgb2-kennzahlen.de-cert.pem
+    ssl_key: /etc/pki/tls/private/www.sgb2-kennzahlen.de-key.pem
+    directories:
+      - root_directory:
+        provider: directory
+        path: '/srv/www/www.sgb2.info'
+        options:
+          - FollowSymLinks
+        allow_override:
+          - All
+#      - 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'
+    rewrites:
+      - alias:
+        comment: 'Alle Aliase auf www.sgb2.info Unterseite'
+        rewrite_rule: 
+          - '^(.*)$ https://www.sgb2.info/kennzahlen/statistik$1 [L,R=301]'
\ No newline at end of file