ODT - hiera cleanup

diff --git a/customer/mbvd-odt/int-odt-daimler-com-temp.pixelpark.net.yaml b/customer/mbvd-odt/int-odt-daimler-com-temp.pixelpark.net.yaml
deleted file mode 100644 (file)
index 483a4da..0000000
--- a/customer/mbvd-odt/int-odt-daimler-com-temp.pixelpark.net.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-site::role: base
-site::additional_classes:
-  - site::profile::apache
-  - apache::mod::proxy_ajp
-
-site::profile::apache::pp_vhosts:
-  dev-odt:
-    docroot: '/var/www'
-    servername: int-odt-daimler-com-temp.pixelpark.net
-    ssl: true
-    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'
-    rewrites_non_ssl:
-      - https:
-        comment: 'almost all to https'
-        rewritecond:
-          - '%{ich-trickse}{REQUEST_URI} !^/.\.html'
-        rewrite_rule:
-          - '^(.*)$ https://int-odt-daimler-com-temp.pixelpark.net$1 [L,R=301]'
-    proxy_preserve_host: true
-    proxy_pass:
-      - { path: /, url: 'ajp://localhost:8009/' }

diff --git a/customer/mbvd-odt/int-odt-daimler-com.pixelpark.net.yaml b/customer/mbvd-odt/int-odt-daimler-com.pixelpark.net.yaml
index 483a4da8e9726949d708d9d94acc80069e7c9f68..6e731fb334f817c97e83e541d0684433cb7ec92b 100644 (file)
--- a/customer/mbvd-odt/int-odt-daimler-com.pixelpark.net.yaml
+++ b/customer/mbvd-odt/int-odt-daimler-com.pixelpark.net.yaml
@@ -7,7 +7,7 @@ site::additional_classes:
 site::profile::apache::pp_vhosts:
   dev-odt:
     docroot: '/var/www'
-    servername: int-odt-daimler-com-temp.pixelpark.net
+    servername: int-odt-daimler-com.pixelpark.net
     ssl: true
     ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
     ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
@@ -18,7 +18,7 @@ site::profile::apache::pp_vhosts:
         rewritecond:
           - '%{ich-trickse}{REQUEST_URI} !^/.\.html'
         rewrite_rule:
-          - '^(.*)$ https://int-odt-daimler-com-temp.pixelpark.net$1 [L,R=301]'
+          - '^(.*)$ https://int-odt-daimler-com.pixelpark.net$1 [L,R=301]'
     proxy_preserve_host: true
     proxy_pass:
       - { path: /, url: 'ajp://localhost:8009/' }

diff --git a/customer/mbvd/int-odt-daimler-com.pixelpark.net.yaml b/customer/mbvd/int-odt-daimler-com.pixelpark.net.yaml
deleted file mode 100644 (file)
index b01e040..0000000
--- a/customer/mbvd/int-odt-daimler-com.pixelpark.net.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
----
-site::role: base
-site::additional_classes:
-  - site::profile::mongodb_server
-  - mongodb::globals
-  - site::profile::apache
-  - apache::mod::proxy_ajp
-
-logstash::filter:
-  - openemm
-
-logstash::generic_resource:
-  openemm-core:
-    resource: file
-    order: 10 # Input
-    parameters:
-      path: '/home/openemm/logs/openemm/openemm_core.log'
-      type: EMM-INT-Core
-      tags:
-        - "%{customer}"
-        - "%{tier}"
-  openemm-data:
-    resource: file
-    order: 10 # Input
-    parameters:
-      path: '/home/openemm/logs/openemm/openemm_data.log'
-      type: EMM-INT-Webservice
-      tags:
-        - "%{customer}"
-        - "%{tier}"
-
-mongodb::globals::manage_package_repo: true
-mongodb::globals::version: 3.0.6-1.el7
-mongodb::globals::bind_ip: 0.0.0.0
-mongodb::globals::repo_location: 'https://repo.pixelpark.com/Linux/yum/mongodb/7/RPMS/'
-mongodb::server::auth: false
-mongodb::server::dbpath: '/srv/mongodb'
-site::profile::mongodb_server::databases:
-  admin:
-    user: admin
-    password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEArc0xBD1X+zcFnkBanU2stIBUHBs3LbuhHSG9fN1IuSvozye0Yg+sA/kgcF+ULDYm9vZRF+u1kNcxaMVR0LiUPYSa2W0n5Db1tSTgqoQuGK+2bfpXdWCCfBXwcmXPkpdeeyeEB+yXsW1OYQBAL1pmvPSz3TzyF/2jpqgPAiicSp1xsAdmsOk7gkUUEms9LExcoi4zp8tTzBnhP5Q6XG12ZeHrEz9djanXBf0O2aWyVZM5DQQLKm9Pl574HfuwnvUCJJhsVy8W8WgciYJgFaCLTupogx7it31bGMHXbogA5BMt0CdW2t8MazPuVWvT0NOFHLaCaZm/vo3qz+XAlCSvJTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDgOagHmNQtdRhR3xktAup+gBDABSJBFGOrv1XhCAmlQJ6J]
-    roles: root
-  handraising:
-    user: handraising
-    password: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAl5ZyrXsIuHQNznU55pqSePyQxZgmAUWDDrrezgTchY7/YytqOylsCGRk8oDrTDUK9Cec7vmurQa9hH2EYwrjRHsln886kZm5dzN3ENw/MazYdOyKrbwlX/0hymZnVRFZHaOgzl65riIwVINfWp/bHHNbWfrthgIEVZD+SsswINX9wJFsB0G+YC7mZDTWqLKOYyV7Ei1ioKwETeo6Pm+phhqw0aKvgj3sgAyb0DL63GoB1+GZHHqTnpmw72Rfkz1LOipHaSYBF1jJ0D8tDwXKqQzZD87pCUyYue9fWHSUboNuK9BtO13Vc/MEMqYLwWa7IZ4Oz7YK2jjKnUofms8UvTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD5myhZKM/iy3Z+FtC32Zr0gBDOHqAVLhGC9UjiUVMbNkw9]
-    roles: readWrite
-
-accounts::users:
-  christian.heggemann:
-    apply: true
-    sudo: true
-  annika.wenzel:
-    apply: true
-    sudo: true
-  deploy.vogel:
-    apply: true
-    sudo: true
-
-apache::default_vhost: false
-
-
-site::profile::apache::vhosts:
-  int-odt-daimler-com:
-    docroot: /srv/www/int-odt-daimler-com
-    servername: int-odt-daimler-com.pixelpark.net
-    port: 80
-    ip: 93.188.107.227
-    docroot_owner: root
-    docroot_group: root
-    proxy_preserve_host: On
-    proxy_pass:
-      - { path: /server-status, url: '!' }
-      - { path: /server-info, url: '!' }
-      - { path: /, url: 'ajp://localhost:8009/' }
-  int-odt-daimler-com_ssl:
-    docroot: /srv/www/int-odt-daimler-com
-    servername: int-odt-daimler-com.pixelpark.net
-    port: 443
-    ssl: true
-    ssl_cert: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
-    ssl_key: '/etc/pki/tls/private/wildcard.pixelpark.net-key.pem'
-    ssl_ca: '/etc/pki/tls/certs/wildcard.pixelpark.net-cert.pem'
-    ip: 93.188.107.227
-    docroot_owner: root
-    docroot_group: root
-    proxy_preserve_host: On
-    proxy_pass:
-      - { path: /server-status, url: '!' }
-      - { path: /server-info, url: '!' }
-      - { path: /, url: 'ajp://localhost:8009/' }