mbvd-trapo - setup live env + config changes

diff --git a/customer/mbvd-trapo/common.yaml b/customer/mbvd-trapo/common.yaml
index 5703c6c6478cf1e6440ad5f82d99d0fa71db5217..d67319b3aa55c2c888bbac2bb987527eb1e99752 100644 (file)
--- a/customer/mbvd-trapo/common.yaml
+++ b/customer/mbvd-trapo/common.yaml
@@ -18,3 +18,9 @@ accounts::users:
   jenkins:
     apply: true
     group: "apache"
+
+sudo::configs:
+  deploy_rights:
+    priority: "06"
+    content: |
+      jenkins ALL=(apache) NOPASSWD: ALL

diff --git a/customer/mbvd-trapo/dev-www-trapo-top10-mercedes-benz-de.pixelpark.net.yaml b/customer/mbvd-trapo/dev-www-trapo-top10-mercedes-benz-de.pixelpark.net.yaml
index ed5cb9c3109eeb0a1d6c1c4309c7c88ab42fdac2..038895837418e386865a18fea00317d0960d38b0 100644 (file)
--- a/customer/mbvd-trapo/dev-www-trapo-top10-mercedes-benz-de.pixelpark.net.yaml
+++ b/customer/mbvd-trapo/dev-www-trapo-top10-mercedes-benz-de.pixelpark.net.yaml
@@ -5,12 +5,6 @@ site::additional_classes:
   - site::profile::mysql_server
   - apache::mod::headers
 
-sudo::configs:
-  deploy_rights:
-    priority: "06"
-    content: |
-      jenkins ALL=(apache) NOPASSWD: ALL
-
 mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAlXwfJ+/QRfIqb4qnvoZ+e+aAhjynrFS9UPfd6RKn8XFA8ykoQ3PGPlg71OK2RZ60cY7NKUt6OaD0kdOnoLN3YwaDkKpIRgOZQD7a7yvjkl+E+jPYLbqLna036rY4sEWseBjXgENqXoP8a3QHZt/eIkn/QWnyxGUVSSOnK0WJTeBDaRm2Lc+BNaIJMxIdQ6RHTR537jxC6ZD7UN8SR44tyJrTc6E7foaHipqZkCLydcB82fjuYlwgAO6lXcyKzJhNlDYdtwyIF1A2fcP5AtfH5iKnSuqYMiFMtfZeZ6NiJOsl8EATTP0NEImi5TneRqAEmOWnH7HVRsvLiQe1TmmiXzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA7f3h4+q6iUBpkE/zMfzTDgCBejDxb0+NksYcDxnsAsL2o3UifQEpXJGgfAe2uEen0LQ==]
 mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAgU7Gl/vjpl5nKL7G/Ep3QW+/UpDRbytfVNFmAnsZ6/nv64sOKyAWxzq1GCb2JchzyqxdvNSx8dwmStT5P8FDXAocN3T2zdskVDhDnGe/DGCVFwpwQ0SHgUZiJNjgKQ1eOwzvqfsI8RdFqxCEKSMFg/4ixJMw660FSnjsQo7SKhHC95n6hcogQTIRXDIPFa5O8D44e6YwLu9vAiMUss7nGenpvS7EbfsUL9fOMR+7hwHbw4Zv+sYD0RONBsHTl4iBBgfHiE/7IFLLIKpY2FuJ5hLXDK264c5FAb/G4I6aZBRHBR8JZ0AZPGRmOkvTxxx95Y9O9mjeyeaPWxjYnosdEzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBArk9dieR7sapVSlhSMQa8ZgCAxmm9tzddFNFlqP4NXBZgjRCwvOnW8vzKsJ+NRtLyf7w==]
 site::profile::mysql_server::databases:

diff --git a/customer/mbvd-trapo/www01-trapo-top10-mercedes-benz-de.pixelpark.net.yaml b/customer/mbvd-trapo/www01-trapo-top10-mercedes-benz-de.pixelpark.net.yaml
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..55e2c607507c9cab26a95feea07b6545d7004be9 100644 (file)
--- a/customer/mbvd-trapo/www01-trapo-top10-mercedes-benz-de.pixelpark.net.yaml
+++ b/customer/mbvd-trapo/www01-trapo-top10-mercedes-benz-de.pixelpark.net.yaml
@@ -1,2 +1,60 @@
 ---
 site::role: base
+site::additional_classes:
+  - site::profile::mysql_server
+  - site::profile::drupal
+  - apache::mod::headers
+
+site::profile::apache::htdigest:
+  server:
+    www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAp3mxg9tdFCDhIGNE0f/n4e/jKWbOkHfvtUVMgZ/no3piygMV2Jh3CupZP0iqOxL2AIgALp1Sp0mViAUwumjkNl4tCRRuYdMd8muLpRAAhkDasBWSS55fFqEIkOhSnQQwUU1GrOTtxczgAeFD5AAYISr0uyOmL9xYOzfLGglK2aotbBGZC6FAqiO1pjj5c8jX17lI4kvsVbUj9Gs9sdXTBRvcRfWDHRFLFW+UBfbuq/vgigASkfgx6Lbd7h1I7UiHKfyOd3HHh7F+vj926epNJzd0DbNFopD8cYcjcaUZFDdAoScr7v4r4M2+447wwI0F6KEfIX9prdHcpBRpav+K8TA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA2tR2+Oh1kJwag2ADDqPkcgBBv5MfH1plrRihKmB5ggZzO]
+
+mysql::server::override_options:
+  'mysqld':
+    server-id: '1'
+    auto_increment_offset: '1'
+    bind-address: '192.168.170.15'
+    auto_increment_increment: '2'
+    log-bin: 'binlog'
+    binlog-format: 'MIXED'
+    binlog-ignore-db: 'performance_schema, information_schema'
+
+mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAXV9BUcfjEE3/YqbOIvh90sUfvfM/XlNTShsFLbRBA8xOsEjP7hRx+j12IcJhcJk+joYuEUBWEfYwq4MaKEPRtSoJY107/vKvISs3A+F0O+d7LJ/WogVTUCv5F5Nc2q/gsXC9V5qAKFoKL9N8uZJOJGZ7mDeMuCO2TVWwgsHgib21nELgGgck9uaR9wz2zlNpjoj5gXU8OQXbk0Cw2a2kP5+jc9fUMStxIc48mo0tCMs2UUpqvBYpD03EQDNunO71vuZU3Tu/Cp+pqpV4DlHbCJrCSurWwFulhI41QKxkzimaah8UGiy3mnTP78msMiFIzVJUlm4WJepuiUZRYrVLBTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDiFGWt5n/KsXituueRwW5egCDf1uM6+HPgs052cK2ywd95SB5A05SDioZu3kgCm2FhMw==]
+mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAYPN/jYBTlQMSYDg/TcDbhieeokANfwrjL7cJjLfp9fu0YqFq6T10x8kudwxioPlX8eAVDKu89rgKrjGHBy4Yc8F8ccIvaHteJcXMppUE1qKWZmOVyK+Cm9yCoAj/seLr7jLLNHZEXY6l3SwQ3NcLogs3aKcvUv14otMNk6h8fTNzkZKreElFMRPcVofJoLJ+zDvipVgbhsbNMM+5viTfvJtDbNDLdz+nDMb3J7fNw7u6FyRqJvCIFfCMGgGZEe/PG6fwuylaI8HUl/HmKAr4vb0ZvgJ4Vrsif1uUR1NeOWLDbnDf3EIXm31nXKdlqPgijOyXQ43igOwtrU/kkx2CojBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCufg4NMFKBngm4haso9LMpgCC+y994hypx8QBevkkEaFqr+sIlDvJ+poA9wsIbksLVFg==]
+mysql::server::users:
+  'replication@%':
+    password_hash: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAhbwgLcAtqiSS1ZX0OVeIovvVdNDbqbw3xBOceDvCbQOOdFrYvYM5faIOUfZnytZXEJ/E7o9QSVMRBzY2i9ik7JQJAGMMAgF17AQYA6eKHWYnhuIGiY6eBqOXpjdTzN9z8bMx3edUfmPJ0hjQ97nTFI8/XHDkuen2M8DsKrH7sgbFLtXQFSahkupvY/Lsr2TX7IaywY2n0o8RTLt6p0eqiT6yrS6VXc574fV7wqshVXHhhPHDJAnFXPOnFbO1JWUD1pk1pZZQusdAfiBSUf3tiBw7KqiY2rmc5W80uXdtSC6ky9ujCL+oRYz+tOqZIlnAbzU2BCTHbXEBvFRp3EjwVDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCizRENYnfoH7cg5SSYEB+ogBBLcx9jO/dWnnsAF/dPTcI0]
+mysql::server::grants:
+  'replication@%/*.*':
+    options: 'GRANT'
+    privileges: 'REPLICATION SLAVE'
+    table: '*.*'
+    user: 'replication@%'
+
+site::profile::mysql_server::databases:
+  trapo:
+    user: trapo
+    password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQO1ZVvRTaMSqV1dq9KLo8lzGYVYwucbTtDAoUfZgowYk26iZhaCvbhwayEDab13cG16R3l4y0OhihdZEY6MqdHAS+ttysWVY5hJe1ovNbF/++NrwlXZw+6SHtMM/EhntKvYYmqsTz9Y4DvF2G0Bp/cOimZmGhJMzf9TS8XAHaQF1SKaLu1HLr0GtHGmOZx6ZD5mRETHg/i7KGC/kWbQRrT4COEPYdGS54g1rCZIFlcDgtJQJ5xw9Ys6GGCmJW/9iZ+5QjGVomy7+I6DxupaFsf56b9kXmcqnVReTmZQIqFZSyTxp4feqz4ss6kaIhz7LFYcai16bDGmqphdT3jaL7TBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCmkQxs9G+s3NZek0QsYFgCgCAUaE1nza0pqGwD8uPbHsoi1tmWmaA4kJWY/L2BYvNCMA==]
+
+site::profile::drupal::projects:
+  trapo:
+    site_path: '/var/www/trapo-top10/web'
+    servername: www01-trapo-top10-mercedes-benz-de.pixelpark.net
+    serveraliases:
+    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:
+      - 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'
+        require:
+          - local
+    user: apache
+    mode: '2775'

diff --git a/customer/mbvd-trapo/www02-trapo-top10-mercedes-benz-de.pixelpark.net.yaml b/customer/mbvd-trapo/www02-trapo-top10-mercedes-benz-de.pixelpark.net.yaml
index 4c3c2b5e11ea2d9721089a2662200af935fbf7be..b795009838d0033814435a393ed64a734f06051d 100644 (file)
--- a/customer/mbvd-trapo/www02-trapo-top10-mercedes-benz-de.pixelpark.net.yaml
+++ b/customer/mbvd-trapo/www02-trapo-top10-mercedes-benz-de.pixelpark.net.yaml
@@ -1,2 +1,60 @@
 ---
 site::role: base
+site::additional_classes:
+  - site::profile::mysql_server
+  - site::profile::drupal
+  - apache::mod::headers
+
+site::profile::apache::htdigest:
+  server:
+    www: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAp3mxg9tdFCDhIGNE0f/n4e/jKWbOkHfvtUVMgZ/no3piygMV2Jh3CupZP0iqOxL2AIgALp1Sp0mViAUwumjkNl4tCRRuYdMd8muLpRAAhkDasBWSS55fFqEIkOhSnQQwUU1GrOTtxczgAeFD5AAYISr0uyOmL9xYOzfLGglK2aotbBGZC6FAqiO1pjj5c8jX17lI4kvsVbUj9Gs9sdXTBRvcRfWDHRFLFW+UBfbuq/vgigASkfgx6Lbd7h1I7UiHKfyOd3HHh7F+vj926epNJzd0DbNFopD8cYcjcaUZFDdAoScr7v4r4M2+447wwI0F6KEfIX9prdHcpBRpav+K8TA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA2tR2+Oh1kJwag2ADDqPkcgBBv5MfH1plrRihKmB5ggZzO]
+
+mysql::server::override_options:
+  'mysqld':
+    server-id: '2'
+    auto_increment_offset: '2'
+    bind-address: '192.168.170.16'
+    auto_increment_increment: '2'
+    log-bin: 'binlog'
+    binlog-format: 'MIXED'
+    binlog-ignore-db: 'performance_schema, information_schema'
+
+mysql::server::root_password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAXV9BUcfjEE3/YqbOIvh90sUfvfM/XlNTShsFLbRBA8xOsEjP7hRx+j12IcJhcJk+joYuEUBWEfYwq4MaKEPRtSoJY107/vKvISs3A+F0O+d7LJ/WogVTUCv5F5Nc2q/gsXC9V5qAKFoKL9N8uZJOJGZ7mDeMuCO2TVWwgsHgib21nELgGgck9uaR9wz2zlNpjoj5gXU8OQXbk0Cw2a2kP5+jc9fUMStxIc48mo0tCMs2UUpqvBYpD03EQDNunO71vuZU3Tu/Cp+pqpV4DlHbCJrCSurWwFulhI41QKxkzimaah8UGiy3mnTP78msMiFIzVJUlm4WJepuiUZRYrVLBTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDiFGWt5n/KsXituueRwW5egCDf1uM6+HPgs052cK2ywd95SB5A05SDioZu3kgCm2FhMw==]
+mysql::server::backup::backuppassword: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAYPN/jYBTlQMSYDg/TcDbhieeokANfwrjL7cJjLfp9fu0YqFq6T10x8kudwxioPlX8eAVDKu89rgKrjGHBy4Yc8F8ccIvaHteJcXMppUE1qKWZmOVyK+Cm9yCoAj/seLr7jLLNHZEXY6l3SwQ3NcLogs3aKcvUv14otMNk6h8fTNzkZKreElFMRPcVofJoLJ+zDvipVgbhsbNMM+5viTfvJtDbNDLdz+nDMb3J7fNw7u6FyRqJvCIFfCMGgGZEe/PG6fwuylaI8HUl/HmKAr4vb0ZvgJ4Vrsif1uUR1NeOWLDbnDf3EIXm31nXKdlqPgijOyXQ43igOwtrU/kkx2CojBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCufg4NMFKBngm4haso9LMpgCC+y994hypx8QBevkkEaFqr+sIlDvJ+poA9wsIbksLVFg==]
+mysql::server::users:
+  'replication@%':
+    password_hash: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAhbwgLcAtqiSS1ZX0OVeIovvVdNDbqbw3xBOceDvCbQOOdFrYvYM5faIOUfZnytZXEJ/E7o9QSVMRBzY2i9ik7JQJAGMMAgF17AQYA6eKHWYnhuIGiY6eBqOXpjdTzN9z8bMx3edUfmPJ0hjQ97nTFI8/XHDkuen2M8DsKrH7sgbFLtXQFSahkupvY/Lsr2TX7IaywY2n0o8RTLt6p0eqiT6yrS6VXc574fV7wqshVXHhhPHDJAnFXPOnFbO1JWUD1pk1pZZQusdAfiBSUf3tiBw7KqiY2rmc5W80uXdtSC6ky9ujCL+oRYz+tOqZIlnAbzU2BCTHbXEBvFRp3EjwVDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCizRENYnfoH7cg5SSYEB+ogBBLcx9jO/dWnnsAF/dPTcI0]
+mysql::server::grants:
+  'replication@%/*.*':
+    options: 'GRANT'
+    privileges: 'REPLICATION SLAVE'
+    table: '*.*'
+    user: 'replication@%'
+
+site::profile::mysql_server::databases:
+  trapo:
+    user: trapo
+    password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAQO1ZVvRTaMSqV1dq9KLo8lzGYVYwucbTtDAoUfZgowYk26iZhaCvbhwayEDab13cG16R3l4y0OhihdZEY6MqdHAS+ttysWVY5hJe1ovNbF/++NrwlXZw+6SHtMM/EhntKvYYmqsTz9Y4DvF2G0Bp/cOimZmGhJMzf9TS8XAHaQF1SKaLu1HLr0GtHGmOZx6ZD5mRETHg/i7KGC/kWbQRrT4COEPYdGS54g1rCZIFlcDgtJQJ5xw9Ys6GGCmJW/9iZ+5QjGVomy7+I6DxupaFsf56b9kXmcqnVReTmZQIqFZSyTxp4feqz4ss6kaIhz7LFYcai16bDGmqphdT3jaL7TBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCmkQxs9G+s3NZek0QsYFgCgCAUaE1nza0pqGwD8uPbHsoi1tmWmaA4kJWY/L2BYvNCMA==]
+
+site::profile::drupal::projects:
+  trapo:
+    site_path: '/var/www/trapo-top10/web'
+    servername: www02-trapo-top10-mercedes-benz-de.pixelpark.net
+    serveraliases:
+    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:
+      - 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'
+        require:
+          - local
+    user: apache
+    mode: '2775'