sirona-aem - switch to site profile

diff --git a/customer/sirona-aem/common.yaml b/customer/sirona-aem/common.yaml
index 580c191b153c502c46faf0a5abae455a24c63d20..a4c444455efe308c35da923c4d67342d1ad23acb 100644 (file)
--- a/customer/sirona-aem/common.yaml
+++ b/customer/sirona-aem/common.yaml
@@ -14,31 +14,31 @@ accounts::users:
 aem::maven::mirrors:
   - {id: pixelpark-nexus, url: 'https://nexus.pixelpark.com/content/groups/public/', mirrorof: '*'}
 # Author
-aem::author::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHvDr/AA7deYYdOheC6zH7+fF1WqVRCS0LSUbHUjvhoSAfNKcpblvy9qHwqT0KZul2/qsFXZczwWD+75YBWxQc2+iGueqv/Pk+0IgWJVr75QxtfCIyDChlfQfEHZuSMwZg32oFFvQ1i1KYEPnhhhVSpeHmeSxKaoKDs7B8uvO+yK2nz61h6TDnOCcnIL40QJuzM9MkfhMXHZzLZiwLgeceA4ONylXJ7tHggz9rF0rp1j9CcgaYtSofZb8y05qpHJqBWxMgZSLbSK1fjwa7IJVZwtVo3JyF3vPZaw+x1QrFV5pcebGqMdEAvrKd3L93UgcVtmH8xZ/GVf8uRmI+gLfmDBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCjElleD+b37Yhg/gf0ei0GgDC+k5ZPTdLTh3OVS+hSRrjL39UKGr47rHTKJ3tIygNgLR+xqlPiDshEyyHncKfjDhc=]
-aem::author::license_product_version: '6.1.0.20150507'
-aem::author::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
-aem::author::license_product_name: 'Adobe Experience Manager'
+site::profile::aem::author::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::author::license_product_version: '6.1.0.20150507'
+site::profile::aem::author::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
+site::profile::aem::author::license_product_name: 'Adobe Experience Manager'
 
-aem::author::jvm_opts: '-d64 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false'
+site::profile::aem::author::jvm_opts: '-d64 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false'
 
 #aem::author::install_packages:
-aem::author::instance_name: author
-aem::author::install_mode: 'quickstart'
-aem::author::install_options:
+site::profile::aem::author::instance_name: author
+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
-aem::publish::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAHvDr/AA7deYYdOheC6zH7+fF1WqVRCS0LSUbHUjvhoSAfNKcpblvy9qHwqT0KZul2/qsFXZczwWD+75YBWxQc2+iGueqv/Pk+0IgWJVr75QxtfCIyDChlfQfEHZuSMwZg32oFFvQ1i1KYEPnhhhVSpeHmeSxKaoKDs7B8uvO+yK2nz61h6TDnOCcnIL40QJuzM9MkfhMXHZzLZiwLgeceA4ONylXJ7tHggz9rF0rp1j9CcgaYtSofZb8y05qpHJqBWxMgZSLbSK1fjwa7IJVZwtVo3JyF3vPZaw+x1QrFV5pcebGqMdEAvrKd3L93UgcVtmH8xZ/GVf8uRmI+gLfmDBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCjElleD+b37Yhg/gf0ei0GgDC+k5ZPTdLTh3OVS+hSRrjL39UKGr47rHTKJ3tIygNgLR+xqlPiDshEyyHncKfjDhc=]
-aem::publish::license_product_version: '6.1.0.20150507'
-aem::publish::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
-aem::publish::license_product_name: 'Adobe Experience Manager'
+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'
+site::profile::aem::publish::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
+site::profile::aem::publish::license_product_name: 'Adobe Experience Manager'
 
-aem::publish::jvm_opts: '-d64 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false'
+site::profile::aem::publish::jvm_opts: '-d64 -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false'
 
-aem::publish::install_mode: 'quickstart'
-aem::publish::instance_name: publish
-aem::publish::install_options:
+site::profile::aem::publish::install_mode: 'quickstart'
+site::profile::aem::publish::instance_name: publish
+site::profile::aem::publish::install_options:
   download_type: maven
   download_uri: com.adobe.aem:aem-quickstart:6.1:jar
 
@@ -50,7 +50,7 @@ aem::dispatcher::download_type_options:
   packaging: so
   repos: https://nexus.pixelpark.com/content/groups/public/
 
-site::profile::apache::pp_vhosts:
+site::profile::aem::publish::pp_vhosts:
   sirona:
     docroot: '/var/www/html/cache'
     docroot_owner: apache

diff --git a/customer/sirona-aem/int-author01-sirona.pixelpark.net.yaml b/customer/sirona-aem/int-author01-sirona.pixelpark.net.yaml
index 306006b46a11952e7536a557f518e7e3bcb464d3..9d22970201888e6bfc3990f2c4fd6865a519efb9 100644 (file)
--- a/customer/sirona-aem/int-author01-sirona.pixelpark.net.yaml
+++ b/customer/sirona-aem/int-author01-sirona.pixelpark.net.yaml
@@ -1,3 +1,3 @@
 ---
 site::additional_classes:
-  - aem::author
+  - site::profile::aem::author

diff --git a/customer/sirona-aem/int-publish01-sirona.pixelpark.net.yaml b/customer/sirona-aem/int-publish01-sirona.pixelpark.net.yaml
index 01f505d3d79754048b874bf1c02f1164874cd3f8..59627fc225e2212b40c8286d168d1ad84d323ec2 100644 (file)
--- a/customer/sirona-aem/int-publish01-sirona.pixelpark.net.yaml
+++ b/customer/sirona-aem/int-publish01-sirona.pixelpark.net.yaml
@@ -1,5 +1,3 @@
 ---
 site::additional_classes:
-  - aem::publish
-  - aem::dispatcher
-  - site::profile::apache
+  - site::profile::aem::publish

diff --git a/customer/sirona-aem/int-publish02-sirona.pixelpark.net.yaml b/customer/sirona-aem/int-publish02-sirona.pixelpark.net.yaml
index 01f505d3d79754048b874bf1c02f1164874cd3f8..59627fc225e2212b40c8286d168d1ad84d323ec2 100644 (file)
--- a/customer/sirona-aem/int-publish02-sirona.pixelpark.net.yaml
+++ b/customer/sirona-aem/int-publish02-sirona.pixelpark.net.yaml
@@ -1,5 +1,3 @@
 ---
 site::additional_classes:
-  - aem::publish
-  - aem::dispatcher
-  - site::profile::apache
+  - site::profile::aem::publish

diff --git a/customer/sirona-aem/int.yaml b/customer/sirona-aem/int.yaml
index 091c71a66fffe40af687d74e9879b7661e5740e7..59ffe8536dfef89db1628de900418ec45232fb1d 100644 (file)
--- a/customer/sirona-aem/int.yaml
+++ b/customer/sirona-aem/int.yaml
@@ -1,9 +1,13 @@
 ---
-aem::author::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEATLVXRVKbu2BUxz9HcNiYym9cm2ec4enXtV9cLKKCtxnH7+kYLx1DLojMMyOLUDki0Al6WlBY+TSUmQhOIGSy7uR+aO/cb7+VbL1fivAWfg4Lk3Xx0NU4lTEsd+Wnaj+5gVmW218i4YTjWUWmUTm7Nckzr5k65buClHD/QaTa1wsytbWTt30HZqcU2pCpxtccLpFBp0Yq9qOySamy022RXxHuEfXaDUfsAI2pA/CSxW9ahRlqer+e0/tV6Z+FQS7WNbSwKl+mmU65F6eBM4Jpx5EM5VZAMljyunRe9xAVSuiZVMksOn6/keZfOsA9cQM5aiAWw8XDJUhzlb4x8TxvXzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAIm82bLUT0XksDlXld0ln8gCBKGVydSqH+E1Jku8MCIWavRNDa8XuZY81GjDKuYx7Lkg==]
-aem::publish::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEATLVXRVKbu2BUxz9HcNiYym9cm2ec4enXtV9cLKKCtxnH7+kYLx1DLojMMyOLUDki0Al6WlBY+TSUmQhOIGSy7uR+aO/cb7+VbL1fivAWfg4Lk3Xx0NU4lTEsd+Wnaj+5gVmW218i4YTjWUWmUTm7Nckzr5k65buClHD/QaTa1wsytbWTt30HZqcU2pCpxtccLpFBp0Yq9qOySamy022RXxHuEfXaDUfsAI2pA/CSxW9ahRlqer+e0/tV6Z+FQS7WNbSwKl+mmU65F6eBM4Jpx5EM5VZAMljyunRe9xAVSuiZVMksOn6/keZfOsA9cQM5aiAWw8XDJUhzlb4x8TxvXzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAIm82bLUT0XksDlXld0ln8gCBKGVydSqH+E1Jku8MCIWavRNDa8XuZY81GjDKuYx7Lkg==]
+site::profile::aem::author::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEATLVXRVKbu2BUxz9HcNiYym9cm2ec4enXtV9cLKKCtxnH7+kYLx1DLojMMyOLUDki0Al6WlBY+TSUmQhOIGSy7uR+aO/cb7+VbL1fivAWfg4Lk3Xx0NU4lTEsd+Wnaj+5gVmW218i4YTjWUWmUTm7Nckzr5k65buClHD/QaTa1wsytbWTt30HZqcU2pCpxtccLpFBp0Yq9qOySamy022RXxHuEfXaDUfsAI2pA/CSxW9ahRlqer+e0/tV6Z+FQS7WNbSwKl+mmU65F6eBM4Jpx5EM5VZAMljyunRe9xAVSuiZVMksOn6/keZfOsA9cQM5aiAWw8XDJUhzlb4x8TxvXzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAIm82bLUT0XksDlXld0ln8gCBKGVydSqH+E1Jku8MCIWavRNDa8XuZY81GjDKuYx7Lkg==]
+site::profile::aem::publish::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEATLVXRVKbu2BUxz9HcNiYym9cm2ec4enXtV9cLKKCtxnH7+kYLx1DLojMMyOLUDki0Al6WlBY+TSUmQhOIGSy7uR+aO/cb7+VbL1fivAWfg4Lk3Xx0NU4lTEsd+Wnaj+5gVmW218i4YTjWUWmUTm7Nckzr5k65buClHD/QaTa1wsytbWTt30HZqcU2pCpxtccLpFBp0Yq9qOySamy022RXxHuEfXaDUfsAI2pA/CSxW9ahRlqer+e0/tV6Z+FQS7WNbSwKl+mmU65F6eBM4Jpx5EM5VZAMljyunRe9xAVSuiZVMksOn6/keZfOsA9cQM5aiAWw8XDJUhzlb4x8TxvXzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAIm82bLUT0XksDlXld0ln8gCBKGVydSqH+E1Jku8MCIWavRNDa8XuZY81GjDKuYx7Lkg==]
 
 aem::packages:
   service_pack_1:
     groupid: "com.adobe.aem"
     artifactid: "aem61-service-pack-1"
-    version: "1.0"
\ No newline at end of file
+    version: "1.0"
+
+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

diff --git a/customer/sirona-aem/prod-author01-sirona.pixelpark.net.yaml b/customer/sirona-aem/prod-author01-sirona.pixelpark.net.yaml
index 306006b46a11952e7536a557f518e7e3bcb464d3..9d22970201888e6bfc3990f2c4fd6865a519efb9 100644 (file)
--- a/customer/sirona-aem/prod-author01-sirona.pixelpark.net.yaml
+++ b/customer/sirona-aem/prod-author01-sirona.pixelpark.net.yaml
@@ -1,3 +1,3 @@
 ---
 site::additional_classes:
-  - aem::author
+  - site::profile::aem::author

diff --git a/customer/sirona-aem/prod-publish01-sirona.pixelpark.net.yaml b/customer/sirona-aem/prod-publish01-sirona.pixelpark.net.yaml
index 01f505d3d79754048b874bf1c02f1164874cd3f8..59627fc225e2212b40c8286d168d1ad84d323ec2 100644 (file)
--- a/customer/sirona-aem/prod-publish01-sirona.pixelpark.net.yaml
+++ b/customer/sirona-aem/prod-publish01-sirona.pixelpark.net.yaml
@@ -1,5 +1,3 @@
 ---
 site::additional_classes:
-  - aem::publish
-  - aem::dispatcher
-  - site::profile::apache
+  - site::profile::aem::publish

diff --git a/customer/sirona-aem/prod-publish02-sirona.pixelpark.net.yaml b/customer/sirona-aem/prod-publish02-sirona.pixelpark.net.yaml
index 01f505d3d79754048b874bf1c02f1164874cd3f8..59627fc225e2212b40c8286d168d1ad84d323ec2 100644 (file)
--- a/customer/sirona-aem/prod-publish02-sirona.pixelpark.net.yaml
+++ b/customer/sirona-aem/prod-publish02-sirona.pixelpark.net.yaml
@@ -1,5 +1,3 @@
 ---
 site::additional_classes:
-  - aem::publish
-  - aem::dispatcher
-  - site::profile::apache
+  - site::profile::aem::publish

diff --git a/customer/sirona-aem/prod.yaml b/customer/sirona-aem/prod.yaml
index 4428b1ce5d4162df40bafe9315d9d741b5a77a2c..4627da0c73276035ee3bd2c49dbbdfec5d90d891 100644 (file)
--- a/customer/sirona-aem/prod.yaml
+++ b/customer/sirona-aem/prod.yaml
@@ -1,6 +1,6 @@
 ---
-aem::author::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEATvxJUrt4yw6JsMEOcHiQO0CRdkeC+xba6hU4g1xoz7XRhaX1vumm3N+oR1ybzSOD6tJ6lzwnQIZzppZTSnjwbp9J/QdoSwMQ4sHdaf5nVHR031yqgyKv0jKDSZnSk7/ShZsU/6rlo2llhPikWazXfMAuR2LRRmkiUKeDhrmz5DA14odqKm7E8Q/3e1UM7hhnkDLrqpv6ooMTSxUK4RMLPCiA9tL3+YTRxDnzrSxVhKAgBwIVUeuq3Kugt6Si1W5nxC6FXJElHjc/z4CWA3H7aA95sZp5I/ghV09CwapFGkhtfaKNsx1dP9ntvkI+aeIZ/Qn/ZN60IGVgunQB0SPTcTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCMwMHyu//olaPpQb/BV4TAgCBbDEHY+M31oUnOI4rsT5L7tIsd3BA8M6CCZ/sr+i5cNA==]
-aem::publish::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEATvxJUrt4yw6JsMEOcHiQO0CRdkeC+xba6hU4g1xoz7XRhaX1vumm3N+oR1ybzSOD6tJ6lzwnQIZzppZTSnjwbp9J/QdoSwMQ4sHdaf5nVHR031yqgyKv0jKDSZnSk7/ShZsU/6rlo2llhPikWazXfMAuR2LRRmkiUKeDhrmz5DA14odqKm7E8Q/3e1UM7hhnkDLrqpv6ooMTSxUK4RMLPCiA9tL3+YTRxDnzrSxVhKAgBwIVUeuq3Kugt6Si1W5nxC6FXJElHjc/z4CWA3H7aA95sZp5I/ghV09CwapFGkhtfaKNsx1dP9ntvkI+aeIZ/Qn/ZN60IGVgunQB0SPTcTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCMwMHyu//olaPpQb/BV4TAgCBbDEHY+M31oUnOI4rsT5L7tIsd3BA8M6CCZ/sr+i5cNA==]
+site::profile::aem::author::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEATvxJUrt4yw6JsMEOcHiQO0CRdkeC+xba6hU4g1xoz7XRhaX1vumm3N+oR1ybzSOD6tJ6lzwnQIZzppZTSnjwbp9J/QdoSwMQ4sHdaf5nVHR031yqgyKv0jKDSZnSk7/ShZsU/6rlo2llhPikWazXfMAuR2LRRmkiUKeDhrmz5DA14odqKm7E8Q/3e1UM7hhnkDLrqpv6ooMTSxUK4RMLPCiA9tL3+YTRxDnzrSxVhKAgBwIVUeuq3Kugt6Si1W5nxC6FXJElHjc/z4CWA3H7aA95sZp5I/ghV09CwapFGkhtfaKNsx1dP9ntvkI+aeIZ/Qn/ZN60IGVgunQB0SPTcTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCMwMHyu//olaPpQb/BV4TAgCBbDEHY+M31oUnOI4rsT5L7tIsd3BA8M6CCZ/sr+i5cNA==]
+site::profile::aem::publish::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEATvxJUrt4yw6JsMEOcHiQO0CRdkeC+xba6hU4g1xoz7XRhaX1vumm3N+oR1ybzSOD6tJ6lzwnQIZzppZTSnjwbp9J/QdoSwMQ4sHdaf5nVHR031yqgyKv0jKDSZnSk7/ShZsU/6rlo2llhPikWazXfMAuR2LRRmkiUKeDhrmz5DA14odqKm7E8Q/3e1UM7hhnkDLrqpv6ooMTSxUK4RMLPCiA9tL3+YTRxDnzrSxVhKAgBwIVUeuq3Kugt6Si1W5nxC6FXJElHjc/z4CWA3H7aA95sZp5I/ghV09CwapFGkhtfaKNsx1dP9ntvkI+aeIZ/Qn/ZN60IGVgunQB0SPTcTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCMwMHyu//olaPpQb/BV4TAgCBbDEHY+M31oUnOI4rsT5L7tIsd3BA8M6CCZ/sr+i5cNA==]
 
 aem::packages:
   service_pack_1:
@@ -8,8 +8,12 @@ aem::packages:
     artifactid: "aem61-service-pack-1"
     version: "1.0"
     
-aem::publish::jvm_heap_min: 4096M
-aem::publish::jvm_heap_max: 6144M
+site::profile::aem::publish::jvm_heap_min: 4096M
+site::profile::aem::publish::jvm_heap_max: 6144M
 
-aem::author::jvm_heap_min: 6144M
-aem::author::jvm_heap_max: 8192M
\ No newline at end of file
+site::profile::aem::author::jvm_heap_min: 6144M
+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

diff --git a/customer/sirona-aem/test-author01-sirona.pixelpark.net.yaml b/customer/sirona-aem/test-author01-sirona.pixelpark.net.yaml
index 306006b46a11952e7536a557f518e7e3bcb464d3..9d22970201888e6bfc3990f2c4fd6865a519efb9 100644 (file)
--- a/customer/sirona-aem/test-author01-sirona.pixelpark.net.yaml
+++ b/customer/sirona-aem/test-author01-sirona.pixelpark.net.yaml
@@ -1,3 +1,3 @@
 ---
 site::additional_classes:
-  - aem::author
+  - site::profile::aem::author

diff --git a/customer/sirona-aem/test-publish01-sirona.pixelpark.net.yaml b/customer/sirona-aem/test-publish01-sirona.pixelpark.net.yaml
index 01f505d3d79754048b874bf1c02f1164874cd3f8..59627fc225e2212b40c8286d168d1ad84d323ec2 100644 (file)
--- a/customer/sirona-aem/test-publish01-sirona.pixelpark.net.yaml
+++ b/customer/sirona-aem/test-publish01-sirona.pixelpark.net.yaml
@@ -1,5 +1,3 @@
 ---
 site::additional_classes:
-  - aem::publish
-  - aem::dispatcher
-  - site::profile::apache
+  - site::profile::aem::publish

diff --git a/customer/sirona-aem/test.yaml b/customer/sirona-aem/test.yaml
index 243be7dccb7ea5d9b369afefe13a68b70c3dea6c..6a716a676793f15b84adb80ac7b09974a269fcee 100644 (file)
--- a/customer/sirona-aem/test.yaml
+++ b/customer/sirona-aem/test.yaml
@@ -1,9 +1,13 @@
 ---
-aem::author::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAOKhSfFIfN8mZcECz51jikjjA3S9Yp62wZ/fH2NtZTDaF/AaVT0GJnPlMjEDg22DQfbogNkEkWoTOUcFuUUCjJSttYVgxA4UK4GTiaUBUQJT6C0sUpgGW0bWtGZA7zmzAPlMuqqXt4vv2eUMjrYhPJs/f/WSOwxHnl8wKrFRrRBDgo15XGEsWjlm+qwGGWqiHtAe8q5SYDWHyQAKZ0R8CsPd3BiAEfwcRMepnog01LT4hu9ztTrHhtCop82XDbPfSzTzo9Z+opIZjEVujDKHyZs3L8hoynJlHz6P0y0t5wlwHvUqTCHwOmpvHK45IjXXL6mQQ6hwiJXjbD3Ck2tusiDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAFGpMUn+PP3ewHIgoYMJc4gCC+1vUDN/0UcTr1ucit7zVO7iUIKjeQ7eHgqc1jOShtPw==]
-aem::publish::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAOKhSfFIfN8mZcECz51jikjjA3S9Yp62wZ/fH2NtZTDaF/AaVT0GJnPlMjEDg22DQfbogNkEkWoTOUcFuUUCjJSttYVgxA4UK4GTiaUBUQJT6C0sUpgGW0bWtGZA7zmzAPlMuqqXt4vv2eUMjrYhPJs/f/WSOwxHnl8wKrFRrRBDgo15XGEsWjlm+qwGGWqiHtAe8q5SYDWHyQAKZ0R8CsPd3BiAEfwcRMepnog01LT4hu9ztTrHhtCop82XDbPfSzTzo9Z+opIZjEVujDKHyZs3L8hoynJlHz6P0y0t5wlwHvUqTCHwOmpvHK45IjXXL6mQQ6hwiJXjbD3Ck2tusiDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAFGpMUn+PP3ewHIgoYMJc4gCC+1vUDN/0UcTr1ucit7zVO7iUIKjeQ7eHgqc1jOShtPw==]
+site::profile::aem::author::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAOKhSfFIfN8mZcECz51jikjjA3S9Yp62wZ/fH2NtZTDaF/AaVT0GJnPlMjEDg22DQfbogNkEkWoTOUcFuUUCjJSttYVgxA4UK4GTiaUBUQJT6C0sUpgGW0bWtGZA7zmzAPlMuqqXt4vv2eUMjrYhPJs/f/WSOwxHnl8wKrFRrRBDgo15XGEsWjlm+qwGGWqiHtAe8q5SYDWHyQAKZ0R8CsPd3BiAEfwcRMepnog01LT4hu9ztTrHhtCop82XDbPfSzTzo9Z+opIZjEVujDKHyZs3L8hoynJlHz6P0y0t5wlwHvUqTCHwOmpvHK45IjXXL6mQQ6hwiJXjbD3Ck2tusiDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAFGpMUn+PP3ewHIgoYMJc4gCC+1vUDN/0UcTr1ucit7zVO7iUIKjeQ7eHgqc1jOShtPw==]
+site::profile::aem::publish::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAOKhSfFIfN8mZcECz51jikjjA3S9Yp62wZ/fH2NtZTDaF/AaVT0GJnPlMjEDg22DQfbogNkEkWoTOUcFuUUCjJSttYVgxA4UK4GTiaUBUQJT6C0sUpgGW0bWtGZA7zmzAPlMuqqXt4vv2eUMjrYhPJs/f/WSOwxHnl8wKrFRrRBDgo15XGEsWjlm+qwGGWqiHtAe8q5SYDWHyQAKZ0R8CsPd3BiAEfwcRMepnog01LT4hu9ztTrHhtCop82XDbPfSzTzo9Z+opIZjEVujDKHyZs3L8hoynJlHz6P0y0t5wlwHvUqTCHwOmpvHK45IjXXL6mQQ6hwiJXjbD3Ck2tusiDBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAFGpMUn+PP3ewHIgoYMJc4gCC+1vUDN/0UcTr1ucit7zVO7iUIKjeQ7eHgqc1jOShtPw==]
 
 aem::packages:
   service_pack_1:
     groupid: "com.adobe.aem"
     artifactid: "aem61-service-pack-1"
-    version: "1.0"
\ No newline at end of file
+    version: "1.0"
+    
+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