MBVD - restructure customers

diff --git a/customer/mbvd-adapter-service/app01-mercedes-benz-de.pixelpark.net.yaml b/customer/mbvd-adapter-service/app01-mercedes-benz-de.pixelpark.net.yaml
deleted file mode 100644 (file)
index 7756db6..0000000
--- a/customer/mbvd-adapter-service/app01-mercedes-benz-de.pixelpark.net.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
----
-infra::role: base
-infra::additional_classes:
-  - java
-  - infra::profile::apache
-
-java::package: java-1.8.0-openjdk-headless
-
-accounts::users:
-  jenkins:
-    apply: true
-    sudo: true
-  dirk-peter.krause:
-    apply: true
-  annika.wenzel:
-    apply: true
-
-sudo::configs:
-  deploy_rights:
-    priority: "06"
-    content: |
-      jenkins ALL=(ALL) NOPASSWD: ALL
-
-infra::profile::apache::pp_vhosts:
-  me-adapter-service:
-    docroot: /var/www/html
-    servername: app01-mercedes-benz-de.pixelpark.net
-    serveraliases:
-      - app-mercedes-benz-de.pixelpark.net
-    cert_servername: 'wildcard.pixelpark.net'
-    cert_customer: 'pixelpark'
-    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'
-    proxy_dest: 'http://localhost:8081'
-    no_proxy_uris:
-      - /server-status
-    directories:
-      - directory_root:
-        provider: directory
-        path: '/var/www/html'
-        options:
-          - FollowSymLinks
-          - MultiViews
-        allow_override:
-          - All
-      - location1:
-        provider: location
-        path: '/'
-        require:
-          - 'ip 217.66.50.0/24'
-          - 'ip 217.66.51.0/24'
-          - 'ip 217.66.56.0/24'
-          - 'ip 77.74.234.0/25'
-    rewrites:
-      - alias:
-        comment: 'Weiterleitung auf https'
-        rewrite_cond:
-          - '%%{ich-trickse}{HTTPS} !=on [NC]'
-        rewrite_rule:
-          - '^(.*)$ https://app01-mercedes-benz-de.pixelpark.net$1 [L,R=301]'
-
-

diff --git a/customer/mbvd-adapter-service/common.yaml b/customer/mbvd-adapter-service/common.yaml
deleted file mode 100644 (file)
index 3b0442d..0000000
--- a/customer/mbvd-adapter-service/common.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-infra::role: base

diff --git a/customer/mbvd-adapter-service/int-app01-mercedes-benz-de.pixelpark.net.yaml b/customer/mbvd-adapter-service/int-app01-mercedes-benz-de.pixelpark.net.yaml
deleted file mode 100644 (file)
index cf3d65f..0000000
--- a/customer/mbvd-adapter-service/int-app01-mercedes-benz-de.pixelpark.net.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
----
-infra::role: base
-infra::additional_classes:
-  - java
-  - infra::profile::apache
-
-java::package: java-1.8.0-openjdk-headless
-
-accounts::users:
-  jenkins:
-    apply: true
-    sudo: true
-  dirk-peter.krause:
-    apply: true
-  annika.wenzel:
-    apply: true
-
-sudo::configs:
-  deploy_rights:
-    priority: "06"
-    content: |
-      jenkins ALL=(ALL) NOPASSWD: ALL
-
-infra::profile::apache::pp_vhosts:
-  me-adapter-service:
-    docroot: /var/www/html
-    servername: int-app01-mercedes-benz-de.pixelpark.net
-    serveraliases:
-      - int-app-mercedes-benz-de.pixelpark.net
-    cert_servername: 'wildcard.pixelpark.net'
-    cert_customer: 'pixelpark'
-    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'
-    proxy_dest: 'http://localhost:8081'
-    no_proxy_uris:
-      - /server-status
-    directories:
-      - directory_root:
-        provider: directory
-        path: '/var/www/html'
-        options:
-          - FollowSymLinks
-          - MultiViews
-        allow_override:
-          - All
-      - location1:
-        provider: location
-        path: '/'
-        require:
-          - 'ip 217.66.50.0/24'
-          - 'ip 217.66.51.0/24'
-          - 'ip 217.66.56.0/24'
-          - 'ip 77.74.234.0/25'
-          - 'ip 10.90.13.0/24'
-    rewrites:
-      - alias:
-        comment: 'Weiterleitung auf https'
-        rewrite_cond:
-          - '%%{ich-trickse}{HTTPS} !=on [NC]'
-        rewrite_rule:
-          - '^(.*)$ https://int-app01-mercedes-benz-de.pixelpark.net$1 [L,R=301]'

diff --git a/customer/mbvd-apps/app01-mercedes-benz-de.pixelpark.net.yaml b/customer/mbvd-apps/app01-mercedes-benz-de.pixelpark.net.yaml
new file mode 100644 (file)
index 0000000..7756db6
--- /dev/null
+++ b/customer/mbvd-apps/app01-mercedes-benz-de.pixelpark.net.yaml
@@ -0,0 +1,63 @@
+---
+infra::role: base
+infra::additional_classes:
+  - java
+  - infra::profile::apache
+
+java::package: java-1.8.0-openjdk-headless
+
+accounts::users:
+  jenkins:
+    apply: true
+    sudo: true
+  dirk-peter.krause:
+    apply: true
+  annika.wenzel:
+    apply: true
+
+sudo::configs:
+  deploy_rights:
+    priority: "06"
+    content: |
+      jenkins ALL=(ALL) NOPASSWD: ALL
+
+infra::profile::apache::pp_vhosts:
+  me-adapter-service:
+    docroot: /var/www/html
+    servername: app01-mercedes-benz-de.pixelpark.net
+    serveraliases:
+      - app-mercedes-benz-de.pixelpark.net
+    cert_servername: 'wildcard.pixelpark.net'
+    cert_customer: 'pixelpark'
+    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'
+    proxy_dest: 'http://localhost:8081'
+    no_proxy_uris:
+      - /server-status
+    directories:
+      - directory_root:
+        provider: directory
+        path: '/var/www/html'
+        options:
+          - FollowSymLinks
+          - MultiViews
+        allow_override:
+          - All
+      - location1:
+        provider: location
+        path: '/'
+        require:
+          - 'ip 217.66.50.0/24'
+          - 'ip 217.66.51.0/24'
+          - 'ip 217.66.56.0/24'
+          - 'ip 77.74.234.0/25'
+    rewrites:
+      - alias:
+        comment: 'Weiterleitung auf https'
+        rewrite_cond:
+          - '%%{ich-trickse}{HTTPS} !=on [NC]'
+        rewrite_rule:
+          - '^(.*)$ https://app01-mercedes-benz-de.pixelpark.net$1 [L,R=301]'
+
+

diff --git a/customer/mbvd-apps/int-app01-mercedes-benz-de.pixelpark.net.yaml b/customer/mbvd-apps/int-app01-mercedes-benz-de.pixelpark.net.yaml
new file mode 100644 (file)
index 0000000..cf3d65f
--- /dev/null
+++ b/customer/mbvd-apps/int-app01-mercedes-benz-de.pixelpark.net.yaml
@@ -0,0 +1,62 @@
+---
+infra::role: base
+infra::additional_classes:
+  - java
+  - infra::profile::apache
+
+java::package: java-1.8.0-openjdk-headless
+
+accounts::users:
+  jenkins:
+    apply: true
+    sudo: true
+  dirk-peter.krause:
+    apply: true
+  annika.wenzel:
+    apply: true
+
+sudo::configs:
+  deploy_rights:
+    priority: "06"
+    content: |
+      jenkins ALL=(ALL) NOPASSWD: ALL
+
+infra::profile::apache::pp_vhosts:
+  me-adapter-service:
+    docroot: /var/www/html
+    servername: int-app01-mercedes-benz-de.pixelpark.net
+    serveraliases:
+      - int-app-mercedes-benz-de.pixelpark.net
+    cert_servername: 'wildcard.pixelpark.net'
+    cert_customer: 'pixelpark'
+    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'
+    proxy_dest: 'http://localhost:8081'
+    no_proxy_uris:
+      - /server-status
+    directories:
+      - directory_root:
+        provider: directory
+        path: '/var/www/html'
+        options:
+          - FollowSymLinks
+          - MultiViews
+        allow_override:
+          - All
+      - location1:
+        provider: location
+        path: '/'
+        require:
+          - 'ip 217.66.50.0/24'
+          - 'ip 217.66.51.0/24'
+          - 'ip 217.66.56.0/24'
+          - 'ip 77.74.234.0/25'
+          - 'ip 10.90.13.0/24'
+    rewrites:
+      - alias:
+        comment: 'Weiterleitung auf https'
+        rewrite_cond:
+          - '%%{ich-trickse}{HTTPS} !=on [NC]'
+        rewrite_rule:
+          - '^(.*)$ https://int-app01-mercedes-benz-de.pixelpark.net$1 [L,R=301]'