mbch-tmodell - live and correction on test

diff --git a/customer/mbch-tmodell/test-www-e-klasse-t-modell-ch.pixelpark.net.yaml b/customer/mbch-tmodell/test-www-e-klasse-t-modell-ch.pixelpark.net.yaml
index 32e0527fa3100dd9f10ce92926a3321bee1ab422..8ca9aef601f37c579404a89cb2eb826a63401084 100644 (file)
--- a/customer/mbch-tmodell/test-www-e-klasse-t-modell-ch.pixelpark.net.yaml
+++ b/customer/mbch-tmodell/test-www-e-klasse-t-modell-ch.pixelpark.net.yaml
@@ -1,7 +1,6 @@
 ---
 site::role: base
 site::additional_classes:
-#   temporär deaktiviert --> wir warten noch auf das update von puppetlabs (apache modul / passenger_user)
   - site::profile::ruby_passenger
   - site::profile::mysql_server
 
@@ -17,11 +16,9 @@ site::profile::apache::htdigest:
     www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEABl52nYw7vxS7QiR6Nb7fFPYnhgbWndAA1rctYQIoLa6zI+3ywr+LCL+7Ukrvc86WnzO37CKa9IOGLb2NxWJWU6D47CXaLtsCoUqTOeCxqvCk2uxvblCv9pkKUaPhKVAWA7jPeDQW40MauTZKZL4L0gTTYG61c/WDxQD3kuAeaKncWGzt9RPDUigWmQcA4fqp//d3dcEQSVO24PFVhWbPAQ26/Uv4V7+bRdeY+lHdLkn/YV/nDwWWJoC+u68vDZJiOnCPg+AVz/5urR0XFMJBIne+LLiHTK/7c1/VOal8lDpY8FoW3bOXjp3PE7+FnM2dvAArLzfF/fRcdlotzQG76DBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC1kQOoVWuztZjlMvn9qDlcgCC40/T2Q6nBB14pwDkhu0nwO0l5mleNpHEsJuM64mf9kw==]
 
 site::profile::ruby_passenger::projects:
-  amggt:
+  tmodell:
     servername: test-www-e-klasse-t-modell-ch.pixelpark.net # WAF Domain
     serveraliases:
-       - www.e-klasse-t-modell.ch # Kundendomain
-       - e-klasse-t-modell.ch
        - test-web-e-klasse-t-modell-ch.pixelpark.net # Realserver Domain
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
@@ -34,10 +31,19 @@ site::profile::ruby_passenger::projects:
     directories:
       - directory_root:
         provider: directory
-        path: '/var/www/tmodell/current/public'
+        path: '/var/www/tmodell/public'
         options:
           - FollowSymLinks
           - MultiViews
         allow_override:
           - All
         directoryindex: 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'
\ No newline at end of file

diff --git a/customer/mbch-tmodell/www-e-klasse-t-modell-ch.pixelpark.net.yaml b/customer/mbch-tmodell/www-e-klasse-t-modell-ch.pixelpark.net.yaml
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..ceb0c93d5430d9e53e600bd4bf9bdf590ddebb61 100644 (file)
--- a/customer/mbch-tmodell/www-e-klasse-t-modell-ch.pixelpark.net.yaml
+++ b/customer/mbch-tmodell/www-e-klasse-t-modell-ch.pixelpark.net.yaml
@@ -1,2 +1,51 @@
 ---
 site::role: base
+site::additional_classes:
+  - site::profile::ruby_passenger
+  - site::profile::mysql_server
+
+mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAPRXlA6AWdjZsk58ZiKR8s3WpulXkUEXUlpkaK3QD3CLOijnFhaB64FPFxwDPaNX0dcUVVpCH/5tfrtraEr5eiMefKI61jlMBev18E4/epbrS2DzophuNScmFHf7hBnqRymgZEsPF4EpProBgTCjMkkeeVsMjM4pQhBSKJPBI1+GfOM2nocCBVx0SyDTdFIdLuMNn4FQkba70em3HRuVsa8CdHl6JeZj6DvBj6dDjT/tAX4yoE6JZg140l/73HfmbOivyn9XwLlnN0K2/wpmCPHz07lfDzSqe8+ufyrAP0xXKq1MmNu+OGZRJ9LVEsAmVQTwT4SuZSRPfD4XaFYRvTzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAwLNdeBIL3hc7hc1v6LsRQgCDMvi/9uCs/LDvUlZq3iuaHmgSztawxZ+Tx/XyIz1TzwA==]
+mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAbz2f1nevHNfH2EOz1pBO2cyFdTTtgE8xMwXHcPyzlNCGhcHm4WWpgpEW1YOBO7LRfOfgUe9jNIK6/3EMkOdMqbsbxe8Z02luzx5OO8TnH/7H4a/gy8YgNZy9MDBHEQHjpUD+kKvmN9Xqktag5kJuoZDcer07FPK6WXnngN/Ew4yKqgfMJwB/4acIhVAOYkcP/x6YL9gO90OUvKHiTZYUnGJ632IgcpqOwAVrLqL4NkbBEjdubiccb5tMfApgmyFPJ+B10hGop2rsQUtxI3SSpKQc8nRrMAMFnBB6EDK/o4561IEmugXyRvDy5DemMq9EBmAvwOp4tcrL51SmCz+H2jBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAGyG6OMGUsDwTr6QjlqFeKgCBttFii1kPvGQngtEjj1WBrIC7sBbsIBQPCO9MEUuqzSg==]
+site::profile::mysql_server::databases:
+  tmodell:
+    user: tmodell
+    password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAg6xl33i3d0A8tswf2okK6aG3MROxZnW20X8iyYsX7gAxK0euNtlJuJmazdCqK2B4dDzcZbSNfAdZnbbYEVGXT3Lx+5qEPQdALWEATDYx6JxwpCbdXwtl+rr602KY4NVyNPdwB9oqrMEpaGyMnOoTTEYf6OUCOwj5OzULltdsd/Lo7YvLVmfS27mzeaYerRWNf5+cdWsyuR7zn3MMCF/1/xg6p7MaD0f9xCqjAaleEAARM1je6RpEbHaddQaUOYfK37Kjgg2pdAsx900dLGvXmGFpeqseWsNPgF5IPGaWdvKrEw3hsT4yTkkXya3amAqK1SAtMVW2okQi61g7GbPa8jBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBsdHb7ALZ1fWHQnEzLoZV2gCDeG8yhOr6USZmhli96W4FAM8yH2ljtBdbJP8cAC99gsw==]
+
+site::profile::apache::htdigest:
+  server:
+    www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAX/3ZF2jIrDWpu0+Dvk6gWqLnoojfUBQ/gkaYlwGlKWFUgbF+zYQnW6QTWi4k9tyivWTR/imzURpxVgKPJaU2arkU+eV9z+oHtGayefaK7aV16TkJn8OKuQ4xC3RaNQfEaE/FtFghzYvBBPxcvfcxnbYlUsPO66IPSwtxCJ8vI4QggyipIlzhxLokOGDuG/cMidJ9P0DGSPLtsZMn7pLsB2Y6f8cK7njGvhxl87W50u1BQCDXQgnlUWf8z6cL8wWRCy13tTeIy181IgboQoP3z7OliNTZz18UCEaYC/680notGqHws8bO7ngNwEflJPIzmXJgj2DxTKywXkqH9QtMTDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDLBmYCBSIp3ErDzA8ynNE7gCAkrXpLrjaZ0cy5ZNSP4fAidujl1KZlDs92z8Uo+NqVcg==]
+
+site::profile::ruby_passenger::projects:
+  tmodell:
+    servername: www-e-klasse-t-modell-ch.pixelpark.net # WAF Domain
+    serveraliases:
+       - www.e-klasse-t-modell.ch # Kundendomain
+       - e-klasse-t-modell.ch
+       - web-e-klasse-t-modell-ch.pixelpark.net # Realserver Domain
+    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'
+    passenger_user: tmodell
+    passenger_app_env: stage
+    approot_owner: apache
+    approot: /var/www/tmodell
+    ruby_version: 'ruby-2.2.5'
+    directories:
+      - directory_root:
+        provider: directory
+        path: '/var/www/tmodell/public'
+        options:
+          - FollowSymLinks
+          - MultiViews
+        allow_override:
+          - All
+        directoryindex: 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'