sirona-aem - add apache for author

diff --git a/customer/sirona-aem/common.yaml b/customer/sirona-aem/common.yaml
index a4c444455efe308c35da923c4d67342d1ad23acb..9a0cfb3e4cdf6cd408e89adb285a7c7e1dda9b76 100644 (file)
--- a/customer/sirona-aem/common.yaml
+++ b/customer/sirona-aem/common.yaml
@@ -27,7 +27,7 @@ site::profile::aem::author::install_mode: 'quickstart'
 site::profile::aem::author::install_options:
   download_type: maven
   download_uri: com.adobe.aem:aem-quickstart:6.1:jar
-  
+
 # Publisher
 site::profile::aem::publish::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHvDr/AA7deYYdOheC6zH7+fF1WqVRCS0LSUbHUjvhoSAfNKcpblvy9qHwqT0KZul2/qsFXZczwWD+75YBWxQc2+iGueqv/Pk+0IgWJVr75QxtfCIyDChlfQfEHZuSMwZg32oFFvQ1i1KYEPnhhhVSpeHmeSxKaoKDs7B8uvO+yK2nz61h6TDnOCcnIL40QJuzM9MkfhMXHZzLZiwLgeceA4ONylXJ7tHggz9rF0rp1j9CcgaYtSofZb8y05qpHJqBWxMgZSLbSK1fjwa7IJVZwtVo3JyF3vPZaw+x1QrFV5pcebGqMdEAvrKd3L93UgcVtmH8xZ/GVf8uRmI+gLfmDBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCjElleD+b37Yhg/gf0ei0GgDC+k5ZPTdLTh3OVS+hSRrjL39UKGr47rHTKJ3tIygNgLR+xqlPiDshEyyHncKfjDhc=]
 site::profile::aem::publish::license_product_version: '6.1.0.20150507'
@@ -50,14 +50,4 @@ aem::dispatcher::download_type_options:
   packaging: so
   repos: https://nexus.pixelpark.com/content/groups/public/
 
-site::profile::aem::publish::pp_vhosts:
-  sirona:
-    docroot: '/var/www/html/cache'
-    docroot_owner: apache
-    directories:
-      - docroot:
-        provider: directory
-        path: '/var/www/html/cache'
-        sethandler: dispatcher-handler
-        options:
-          - FollowSymLinks
+

diff --git a/customer/sirona-aem/int.yaml b/customer/sirona-aem/int.yaml
index 59ffe8536dfef89db1628de900418ec45232fb1d..2daf60b6d0f1f4ab37fde68f3b2c000540da5f72 100644 (file)
--- a/customer/sirona-aem/int.yaml
+++ b/customer/sirona-aem/int.yaml
@@ -10,4 +10,44 @@ aem::packages:
 
 site::profile::apache::htdigest:
   server:
-    www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAC6UHVr2KCcP2R0AcXYupc1zdKkh7YXJ/xINkSpTyYRYBWw29eQ6JUa/mx4eYqRjqz0x37w6wqsTqLIcizJMdGVKpQipBXLuLQ5hA3YOWRST+bupvG0JoCEaQVczj/AikRE3Mf+QzOBaQMwEo4e/exCLKNZEuDfnIspJb5oTPbi2vaNJgEHWNJS6hTLf1ZonzvOXe4Mtqw+5B8xAosLDVGvWM1Zb7Hrb/8tUjG1xsaJ9YqLzVF1qH5ytmPmEfhImPMN9u490VzTMObYt6XivSuIpA/0q9tBfH12rz4A1yZPbnpX4iDlFHRDcJiVWyNgZp7IrFovDSlmS2OQHMgOMvRTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDwKyXhMzA7p/9rpHf1H+MNgCBbwv2GdbEw958QxRxezuECS1fkS97ZUkydQI9NuOoQeA==]
\ No newline at end of file
+    www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAC6UHVr2KCcP2R0AcXYupc1zdKkh7YXJ/xINkSpTyYRYBWw29eQ6JUa/mx4eYqRjqz0x37w6wqsTqLIcizJMdGVKpQipBXLuLQ5hA3YOWRST+bupvG0JoCEaQVczj/AikRE3Mf+QzOBaQMwEo4e/exCLKNZEuDfnIspJb5oTPbi2vaNJgEHWNJS6hTLf1ZonzvOXe4Mtqw+5B8xAosLDVGvWM1Zb7Hrb/8tUjG1xsaJ9YqLzVF1qH5ytmPmEfhImPMN9u490VzTMObYt6XivSuIpA/0q9tBfH12rz4A1yZPbnpX4iDlFHRDcJiVWyNgZp7IrFovDSlmS2OQHMgOMvRTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDwKyXhMzA7p/9rpHf1H+MNgCBbwv2GdbEw958QxRxezuECS1fkS97ZUkydQI9NuOoQeA==]
+
+# Apache Publisher
+site::profile::aem::publish::pp_vhosts:
+  sirona:
+    docroot: '/var/www/html/cache'
+    docroot_owner: apache
+    directories:
+      - docroot:
+        provider: directory
+        path: '/var/www/html/cache'
+        sethandler: dispatcher-handler
+        options:
+          - FollowSymLinks
+      - location1:
+        provider: location
+        path: '/'
+        auth_type: Digest
+        auth_name: www
+        auth_digest_provider: file
+        auth_digest_algorithm: MD5
+        auth_user_file: '/etc/httpd/htdigest'
+        auth_require: 'valid-user'
+
+# Apache Author
+site::profile::aem::author::pp_vhosts:
+  sirona:
+    docroot: '/var/www'
+    directories:
+      - docroot:
+        provider: directory
+        path: '/var/www/'
+      - location1:
+        provider: location
+        path: '/'
+        auth_type: Digest
+        auth_name: www
+        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/sirona-aem/prod.yaml b/customer/sirona-aem/prod.yaml
index 4627da0c73276035ee3bd2c49dbbdfec5d90d891..c24b0f709e43ad91da6da0935961deef768a2cf1 100644 (file)
--- a/customer/sirona-aem/prod.yaml
+++ b/customer/sirona-aem/prod.yaml
@@ -16,4 +16,47 @@ site::profile::aem::author::jvm_heap_max: 8192M
 
 site::profile::apache::htdigest:
   server:
-    www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAgXGL8yKBQfWtlGeVsg1+GZixvGuji+xKkBsVmHnmSEzHcWf+0n+vgT78n7Cbu1bEsvEK3rgxYy/tJmAjif/arLMxMKwGvPHRRIflLFR8aOVAVzVr51ou9G6dzp4VFFKpcoC8dMJDoU916Iit5rR9gur3fiOxTldHYm9ACC3LS5ob1LFy4eM8ZfitOgFyd7fMUpeTJOJOo3wvxt9228DmPZ/+lktrMeCbWpUaYQkIdIUTGfO1E2HOreR/kB4KKXtdJr86R1CpuhaOCopcygvSKA2yEtdbpXLVrhNG6q4UeUx7ZkSqmP3CxgGJh89zVS/DZzKEHZBTxDPOyHfups/wcjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBdBISg03E1LAQ1Na16W5uwgCAlIRifeGFvQ/cGA+GJgrWL1jVdB06FonJX4CPjaHe3XA==]
\ No newline at end of file
+    www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAgXGL8yKBQfWtlGeVsg1+GZixvGuji+xKkBsVmHnmSEzHcWf+0n+vgT78n7Cbu1bEsvEK3rgxYy/tJmAjif/arLMxMKwGvPHRRIflLFR8aOVAVzVr51ou9G6dzp4VFFKpcoC8dMJDoU916Iit5rR9gur3fiOxTldHYm9ACC3LS5ob1LFy4eM8ZfitOgFyd7fMUpeTJOJOo3wvxt9228DmPZ/+lktrMeCbWpUaYQkIdIUTGfO1E2HOreR/kB4KKXtdJr86R1CpuhaOCopcygvSKA2yEtdbpXLVrhNG6q4UeUx7ZkSqmP3CxgGJh89zVS/DZzKEHZBTxDPOyHfups/wcjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBdBISg03E1LAQ1Na16W5uwgCAlIRifeGFvQ/cGA+GJgrWL1jVdB06FonJX4CPjaHe3XA==]
+
+# Apache Publisher
+site::profile::aem::publish::pp_vhosts:
+  sirona:
+    docroot: '/var/www/html/cache'
+    docroot_owner: apache
+    directories:
+      - docroot:
+        provider: directory
+        path: '/var/www/html/cache'
+        sethandler: dispatcher-handler
+        options:
+          - FollowSymLinks
+
+# Apache Author
+site::profile::aem::author::enable_apache: true
+site::profile::aem::author::pp_vhosts:
+  sirona-author:
+    docroot: '/var/www'
+    servername: prod-sirona-author.pixelpark.net
+    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_no_ssl:
+      - https:
+        comment: 'all to https'
+        rewrite_rule:
+          - '^(.*)$ https://prod-sirona-author.pixelpark.net$1 [L,R=302]'
+    proxy_pass:
+      - { path: /, url: 'http://localhost:4502/' }
+    directories:
+      - docroot:
+        provider: directory
+        path: '/var/www/'
+      - location1:
+        provider: location
+        path: '/'
+        auth_type: Digest
+        auth_name: www
+        auth_digest_provider: file
+        auth_digest_algorithm: MD5
+        auth_user_file: '/etc/httpd/htdigest'
+        auth_require: 'valid-user'

diff --git a/customer/sirona-aem/test.yaml b/customer/sirona-aem/test.yaml
index 6a716a676793f15b84adb80ac7b09974a269fcee..d6e497dc41d047467ce0453bdc17d1b2cbb25bd5 100644 (file)
--- a/customer/sirona-aem/test.yaml
+++ b/customer/sirona-aem/test.yaml
@@ -10,4 +10,44 @@ aem::packages:
     
 site::profile::apache::htdigest:
   server:
-    www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEApKE+VEBNzSXc8slYU25oAb9vqkpkJTCPld4U+gVaiSm732qDYwUM2BotAwLfUdLry7yms86f2O885IVezAzFFWuJQgV5E/mXGfQu8LCF//9b84w4lGPnmtvEs1MPhHdA2YPJA+NurFTcneT8WzldXttn18+Z+j9uNg6C0RtXXnl1mxd5T0yZ/WH/DfVIuDKhEPMzZ9tWB9ehLy1Y9Purnub2mbhozCygPlAZAg20IN4xOG5cgKUYfI5zcfvRB4exWFnV2jMC3uikY/u53/hAaAC+56d5XjJ94awFi4SpxIkK/M1odmksD6eUaB3O5y+Mj9gLdo8OA7tDm2phlfTnQjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDLIe922oQOBCvb0UtgFNTAgCBI9HFm6wJUUN6QQbETF5xCCakH1Of53f/HipKy93P6Og==]
\ No newline at end of file
+    www: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEApKE+VEBNzSXc8slYU25oAb9vqkpkJTCPld4U+gVaiSm732qDYwUM2BotAwLfUdLry7yms86f2O885IVezAzFFWuJQgV5E/mXGfQu8LCF//9b84w4lGPnmtvEs1MPhHdA2YPJA+NurFTcneT8WzldXttn18+Z+j9uNg6C0RtXXnl1mxd5T0yZ/WH/DfVIuDKhEPMzZ9tWB9ehLy1Y9Purnub2mbhozCygPlAZAg20IN4xOG5cgKUYfI5zcfvRB4exWFnV2jMC3uikY/u53/hAaAC+56d5XjJ94awFi4SpxIkK/M1odmksD6eUaB3O5y+Mj9gLdo8OA7tDm2phlfTnQjBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDLIe922oQOBCvb0UtgFNTAgCBI9HFm6wJUUN6QQbETF5xCCakH1Of53f/HipKy93P6Og==]
+
+# Apache Publisher
+site::profile::aem::publish::pp_vhosts:
+  sirona:
+    docroot: '/var/www/html/cache'
+    docroot_owner: apache
+    directories:
+      - docroot:
+        provider: directory
+        path: '/var/www/html/cache'
+        sethandler: dispatcher-handler
+        options:
+          - FollowSymLinks
+      - location1:
+        provider: location
+        path: '/'
+        auth_type: Digest
+        auth_name: www
+        auth_digest_provider: file
+        auth_digest_algorithm: MD5
+        auth_user_file: '/etc/httpd/htdigest'
+        auth_require: 'valid-user'
+
+# Apache Author
+site::profile::aem::author::pp_vhosts:
+  sirona:
+    docroot: '/var/www'
+    directories:
+      - docroot:
+        provider: directory
+        path: '/var/www/'
+      - location1:
+        provider: location
+        path: '/'
+        auth_type: Digest
+        auth_name: www
+        auth_digest_provider: file
+        auth_digest_algorithm: MD5
+        auth_user_file: '/etc/httpd/htdigest'
+        auth_require: 'valid-user'