sirona-aem - merge things to common.yaml

diff --git a/customer/sirona-aem/common.yaml b/customer/sirona-aem/common.yaml
index f808a690b77c8292aa852812aa8d2c0ce7c3277e..60bf84ed65bb2dfa6689952953c2375a62df81a4 100644 (file)
--- a/customer/sirona-aem/common.yaml
+++ b/customer/sirona-aem/common.yaml
@@ -62,7 +62,7 @@ apache::mod::worker::threadlimit: 50
 # Author
 #
 infra::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=]
-infra::profile::aem::author::license_product_version: '6.1.0.20150507'
+infra::profile::aem::author::license_product_version: '6.2.0'
 infra::profile::aem::author::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
 infra::profile::aem::author::license_product_name: 'Adobe Experience Manager'
 
@@ -73,10 +73,23 @@ infra::profile::aem::author::instance_name: author
 infra::profile::aem::author::install_mode: 'quickstart'
 infra::profile::aem::author::install_options:
   download_type: maven
-  download_uri: com.adobe.aem:aem-quickstart:6.1:jar
+  download_uri: com.adobe.aem:aem-quickstart:6.2:jar
+infra::profile::aem::author::install_files:
+  org.apache.jackrabbit.oak.plugins.blob.datastore.FileDataStore.cfg:
+    content: |
+      path=./crx-quickstart/repository/datastore
+      minRecordLength=1048576
+  org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.cfg:
+    content: |
+      customBlobStore=true
+  org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.config:
+    content: |
+      repository.home=${repository.home}/segmentstore
+      tarmk.size=256
+      pauseCompaction=B"false"
 
 # Compaction & Backup for Author
-infra::profile::aem::author::oak_version: '1.2.7'
+infra::profile::aem::author::oak_version: 1.4.8
 infra::profile::aem::author::backup_command: '/usr/bin/sudo -n /usr/local/sbin/zfs_rotation.sh datapool 2592000'
 infra::profile::aem::author::compaction_timeout: 21600 # 6h Timeout
 infra::profile::aem::author::mail_to:
@@ -86,7 +99,7 @@ infra::profile::aem::author::mail_to:
 # Publisher 
 #
 infra::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=]
-infra::profile::aem::publish::license_product_version: '6.1.0.20150507'
+infra::profile::aem::publish::license_product_version: '6.2.0'
 infra::profile::aem::publish::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
 infra::profile::aem::publish::license_product_name: 'Adobe Experience Manager'
 
@@ -96,10 +109,23 @@ infra::profile::aem::publish::install_mode: 'quickstart'
 infra::profile::aem::publish::instance_name: publish
 infra::profile::aem::publish::install_options:
   download_type: maven
-  download_uri: com.adobe.aem:aem-quickstart:6.1:jar
+  download_uri: com.adobe.aem:aem-quickstart:6.2:jar
+infra::profile::aem::publish::install_files:
+  org.apache.jackrabbit.oak.plugins.blob.datastore.FileDataStore.cfg:
+    content: |
+      path=./crx-quickstart/repository/datastore
+      minRecordLength=1048576
+  org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.cfg:
+    content: |
+      customBlobStore=true
+  org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.config:
+    content: |
+      repository.home=${repository.home}/segmentstore
+      tarmk.size=256
+      pauseCompaction=B"false"
 
 # Compaction & Backup for Publisher
-infra::profile::aem::publish::oak_version: '1.2.7'
+infra::profile::aem::publish::oak_version: 1.4.8
 infra::profile::aem::publish::backup_command: '/usr/bin/sudo -n /usr/local/sbin/zfs_rotation.sh datapool 2592000'
 infra::profile::aem::publish::compaction_timeout: 21600 # 6h Timeout
 infra::profile::aem::publish::mail_to:

diff --git a/customer/sirona-aem/development.yaml b/customer/sirona-aem/development.yaml
index 527b78039503c8a2bcdce5732608b76324e102c1..5b7629fd928bad013d0e60c27c97b5973778afcc 100644 (file)
--- a/customer/sirona-aem/development.yaml
+++ b/customer/sirona-aem/development.yaml
@@ -34,60 +34,12 @@ sudo::configs:
       deploy.vogel ALL=(aem) NOPASSWD: ALL
 
 # Author
-infra::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=]
-infra::profile::aem::author::license_product_version: '6.2.0'
-infra::profile::aem::author::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
-infra::profile::aem::author::license_product_name: 'Adobe Experience Manager'
 infra::profile::aem::author::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAcy620f813a2WJgRBWNdekp3xno+PYgGqUqHy0B+YXKZHEawt6lb17WlegQ/UCzxc7QTx0lrUNDD2hsOI0VpXrRInxMcwJqILXgky9EZ+ZaOhwoRA/Dct45w/7B3Ig4xbuy/TUUwNFFw9n+63OKH53qr+WKRrIbDnIr9kF4vox/cAdE4KuBDOT+YsTEaWCq+4TezSFxwW2bPo4sjLJ3UZuNp4U3JKXyJDAIZK2R/GtuXA6Ks0hLUih1ZvA1WU2p2uT7qee8jdLNLJmKn2OpNrh/uWCtKtECX7dToQRNk8+QNYcq85UsEN02J5eptU+Upwc5aX/DYKKCPSgdL97ns+5zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC3W/GdD9T9k4I0ul8e/RNkgCBAia9/PxWvFDLVqmTGWZmTIs/JYA+h8+yAbveKvDtzcA==]
 infra::profile::aem::author::oak_version: 1.4.8
 # Publisher
-infra::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=]
-infra::profile::aem::publish::license_product_version: '6.2.0'
-infra::profile::aem::publish::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
-infra::profile::aem::publish::license_product_name: 'Adobe Experience Manager'
 infra::profile::aem::publish::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAcy620f813a2WJgRBWNdekp3xno+PYgGqUqHy0B+YXKZHEawt6lb17WlegQ/UCzxc7QTx0lrUNDD2hsOI0VpXrRInxMcwJqILXgky9EZ+ZaOhwoRA/Dct45w/7B3Ig4xbuy/TUUwNFFw9n+63OKH53qr+WKRrIbDnIr9kF4vox/cAdE4KuBDOT+YsTEaWCq+4TezSFxwW2bPo4sjLJ3UZuNp4U3JKXyJDAIZK2R/GtuXA6Ks0hLUih1ZvA1WU2p2uT7qee8jdLNLJmKn2OpNrh/uWCtKtECX7dToQRNk8+QNYcq85UsEN02J5eptU+Upwc5aX/DYKKCPSgdL97ns+5zBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC3W/GdD9T9k4I0ul8e/RNkgCBAia9/PxWvFDLVqmTGWZmTIs/JYA+h8+yAbveKvDtzcA==]
 infra::profile::aem::publish::oak_version: 1.4.8
 
-#aem::author::install_packages:
-infra::profile::aem::author::instance_name: author
-infra::profile::aem::author::install_mode: 'quickstart'
-infra::profile::aem::author::install_options:
-  download_type: maven
-  download_uri: com.adobe.aem:aem-quickstart:6.2:jar
-infra::profile::aem::author::install_files:
-  org.apache.jackrabbit.oak.plugins.blob.datastore.FileDataStore.cfg:
-    content: |
-      path=./crx-quickstart/repository/datastore
-      minRecordLength=1048576
-  org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.cfg:
-    content: |
-      customBlobStore=true
-  org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.config:
-    content: |
-      repository.home=${repository.home}/segmentstore
-      tarmk.size=256
-      pauseCompaction=B"false"
-
-infra::profile::aem::publish::install_mode: 'quickstart'
-infra::profile::aem::publish::instance_name: publish
-infra::profile::aem::publish::install_options:
-  download_type: maven
-  download_uri: com.adobe.aem:aem-quickstart:6.2:jar
-infra::profile::aem::publish::install_files:
-  org.apache.jackrabbit.oak.plugins.blob.datastore.FileDataStore.cfg:
-    content: |
-      path=./crx-quickstart/repository/datastore
-      minRecordLength=1048576
-  org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.cfg:
-    content: |
-      customBlobStore=true
-  org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.config:
-    content: |
-      repository.home=${repository.home}/segmentstore
-      tarmk.size=256
-      pauseCompaction=B"false"
-
-
 aem::maven::mirrors:
   - {id: pixelpark-nexus, url: 'https://nexus.pixelpark.com/content/groups/public/', mirrorof: '*,!pixelpark-nexus,!sirona-releases,!sirona-snapshots'}
 aem::maven::repos:

diff --git a/customer/sirona-aem/production.yaml b/customer/sirona-aem/production.yaml
index 55f3eb4671c77c3be844308cc91b31053e4d6d57..11dfafa854f65e6898a99cd46fbe393c2b726abf 100644 (file)
--- a/customer/sirona-aem/production.yaml
+++ b/customer/sirona-aem/production.yaml
@@ -14,19 +14,14 @@ accounts::users:
       - 'aem'
 
 # Author
-infra::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=]
-infra::profile::aem::author::license_product_version: '6.2.0'
-infra::profile::aem::author::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
-infra::profile::aem::author::license_product_name: 'Adobe Experience Manager'
 infra::profile::aem::author::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAChQgmoCFgGytTAfaXPn3pyWVrS3qbVqEmNJTWUctffk0GIhzOMnQNbVYD0RIl/x7/kJZq7/uuZMdYyygmvbRyHu2Oel405M0UVjxAZdRQO9NQ79f68BzEbvMMO2cZB/N/Hi4cj4sQbl5SiyvkFUmXhgHCdk1vmjC5Afm1jv9xpngW0RE3fQ4elnCjEIz5+oJoCK1JaQjXVlXmKM7EQBuBQ4Tz0OYuU3XA331g9CGrIGjaw8BnG9Ufmre5mWWG0nug+C33mRjkdUP5W1qSSNdT4dLzr1cZZnWxfEJXir+4yO2JimUDWulwcfF0JPU94QPIiDwR7hLiYd7I4rsgk7/jzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCpdga+IqNzyrek24Z1AdzIgCAdtWyrNkZcZp0wS+OgbkioCdy85Et9xe0kC2dhYQbwJA==]
 infra::profile::aem::author::oak_version: 1.4.8
+infra::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 -XX:SurvivorRatio=20 -XX:TargetSurvivorRatio=0 -XX:MaxTenuringThreshold=8 -XX:+UseParNewGC -XX:ParallelGCThreads=4 -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+CMSCompactWhenClearAllSoftRefs -XX:CMSInitiatingOccupancyFraction=85 -XX:+CMSScavengeBeforeRemark -XX:+UseCompressedOops -XX:+DisableExplicitGC -Doak.queryLimitInMemory=500000 -Doak.queryLimitReads=100000 -Doak.fastQuerySize=true'
 # Publisher
-infra::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=]
-infra::profile::aem::publish::license_product_version: '6.2.0'
-infra::profile::aem::publish::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
-infra::profile::aem::publish::license_product_name: 'Adobe Experience Manager'
+
 infra::profile::aem::publish::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAChQgmoCFgGytTAfaXPn3pyWVrS3qbVqEmNJTWUctffk0GIhzOMnQNbVYD0RIl/x7/kJZq7/uuZMdYyygmvbRyHu2Oel405M0UVjxAZdRQO9NQ79f68BzEbvMMO2cZB/N/Hi4cj4sQbl5SiyvkFUmXhgHCdk1vmjC5Afm1jv9xpngW0RE3fQ4elnCjEIz5+oJoCK1JaQjXVlXmKM7EQBuBQ4Tz0OYuU3XA331g9CGrIGjaw8BnG9Ufmre5mWWG0nug+C33mRjkdUP5W1qSSNdT4dLzr1cZZnWxfEJXir+4yO2JimUDWulwcfF0JPU94QPIiDwR7hLiYd7I4rsgk7/jzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCpdga+IqNzyrek24Z1AdzIgCAdtWyrNkZcZp0wS+OgbkioCdy85Et9xe0kC2dhYQbwJA==]
 infra::profile::aem::publish::oak_version: 1.4.8
+infra::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 -XX:SurvivorRatio=20 -XX:TargetSurvivorRatio=0 -XX:MaxTenuringThreshold=8 -XX:+UseParNewGC -XX:ParallelGCThreads=4 -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+CMSCompactWhenClearAllSoftRefs -XX:CMSInitiatingOccupancyFraction=85 -XX:+CMSScavengeBeforeRemark -XX:+UseCompressedOops -XX:+DisableExplicitGC -Doak.queryLimitInMemory=500000 -Doak.queryLimitReads=100000 -Doak.fastQuerySize=true'
 
 aem::maven::mirrors:
   - {id: pixelpark-nexus, url: 'https://nexus.pixelpark.com/content/groups/public/', mirrorof: '*,!pixelpark-nexus,!sirona-releases'}
@@ -47,46 +42,6 @@ aem::maven::servers:
     username: sirona
     password: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAbTW1ZWhJ6XWqPPdsU4vXYYLQk8zEOh0y/a/g5SJ8bFH8ygZrbTNHeEaVTKLguF8Qai5diDKzL3pUiQUlRlbb6m69rf+g4hlNUM1n5PA6dfNnqUaMfpRH0X8VvhE6/Pgz/9zOep92UlVO9Aj78IZddWOjWd1Rj0KJ/RFoLBPfkXL7sgFv2pfoFMQIQ+5Yelaq+hy4vNbIKeJx1poHA9JEEl7O18bzYTO/TFzlvjbM4MphRvbM39c3F7IVV6A4PfZEYIFamHoijrWSuA9QoHCB6m5p/SgGisiKshpaQvBhAsmMmWXvHlFy0xifkt3ZllBPdSdtZuLnBHIpOAhNZcMZOTBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBMwmGTKpQIcXGnUejWqwRFgCCDSr38JPWvgcVYUXTLTBOTx+GXPyygaUwFjHLOtIJnrQ==]
 
-#aem::author::install_packages:
-infra::profile::aem::author::instance_name: author
-infra::profile::aem::author::install_mode: 'quickstart'
-infra::profile::aem::author::install_options:
-  download_type: maven
-  download_uri: com.adobe.aem:aem-quickstart:6.2:jar
-infra::profile::aem::author::install_files:
-  org.apache.jackrabbit.oak.plugins.blob.datastore.FileDataStore.cfg:
-    content: |
-      path=./crx-quickstart/repository/datastore
-      minRecordLength=1048576
-  org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.cfg:
-    content: |
-      customBlobStore=true
-  org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.config:
-    content: |
-      repository.home=${repository.home}/segmentstore
-      tarmk.size=256
-      pauseCompaction=B"false"
-
-infra::profile::aem::publish::install_mode: 'quickstart'
-infra::profile::aem::publish::instance_name: publish
-infra::profile::aem::publish::install_options:
-  download_type: maven
-  download_uri: com.adobe.aem:aem-quickstart:6.2:jar
-
-infra::profile::aem::publish::install_files:
-  org.apache.jackrabbit.oak.plugins.blob.datastore.FileDataStore.cfg:
-    content: |
-      path=./crx-quickstart/repository/datastore
-      minRecordLength=1048576
-  org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.cfg:
-    content: |
-      customBlobStore=true
-  org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.config:
-    content: |
-      repository.home=${repository.home}/segmentstore
-      tarmk.size=256
-      pauseCompaction=B"false"
-
 aem::packages:
   cq-6.2.0-hotfix-10870:
     groupid: 'com.adobe.aem'

diff --git a/customer/sirona-aem/test.yaml b/customer/sirona-aem/test.yaml
index 5d0e99bd0402c6f67cd43fde18cb910a4533503a..808a6aea86b2be2817f8b503385f5439e01f7def 100644 (file)
--- a/customer/sirona-aem/test.yaml
+++ b/customer/sirona-aem/test.yaml
@@ -25,66 +25,12 @@ sudo::configs:
       deploy.vogel ALL=(aem) NOPASSWD: ALL
 
 # Author
-infra::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=]
-infra::profile::aem::author::license_product_version: '6.2.0'
-infra::profile::aem::author::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
-infra::profile::aem::author::license_product_name: 'Adobe Experience Manager'
-# echtes admin passswort
 infra::profile::aem::author::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAZCjhM/H/XoqufG54YM5hZ1DnFPI/WZdHkQqlRPnyHC0NG+uvloR13ew6ht+IHfAaXQW0oiWEyn6G3TtBQMonknWJBfi2+czQoBlM3/UeiSpICRUjxxbSs5y+THHzrVR6J8AqdY86Wr0vAdGXlx/dTg6RkPRiAUwfrVxxgqTSV5DReUrIi5FQcBlJzyL+33B8KcRjPk2smvkV24y+/mL5qXm2Sck0Ek3V9AfYnTpWZ261PWqgYmC4aI4vx5maprNiQBxlt8PLT9TROvZh9tWp6jmCYkxQZkk8FpqrkjawwgNqMyqPSFo5aKg/pRSMJcNT7ss5eu3W8MtbfKcWPanamzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCJbdvpcLuOqzKOyYyQ0ZPWgCDNlMrXU0uaDq9b5+W5XmMDynR/0mmx1X3KVdksri71DQ==]
-# admin passswort ist admin
-# infra::profile::aem::author::admin_pass: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEALC8JAdv3FCdkq6yFBJME4jXn39wDM20XHISJMCvwtFi+v2jEkKXXXg595wAsfVG34ub72HR7HoFRQb7ciU4bThzCOkNkGmndMLbss9M9GfhFJsnX1tt1QX9gf+SpljLjz3qRYoXZeOc6BZsXelMnW9VEN/Bc7rKAm0InvngVMAL6Bz7cI58tjKBZzvibyPX3eN/wvdR63/0xsxXiXmvqu2myE/E3lo3uMeENaNIJnl7D1SqlNPgC5x6aPX2/iCVlvwbCS1iiGvLSfQSjK5qbofil9KuRGXwbrOqZYok3hOYtrhXlNBEoYgs31sA8UtiBw6chEntHdxSbMxGhTmcoXjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBkAWpYa4Zj3cx6MbSLJo1pgBBknstNOXBrrfN9PxBwe+Xe]
 infra::profile::aem::author::oak_version: 1.4.8
 # Publisher
-infra::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=]
-infra::profile::aem::publish::license_product_version: '6.2.0'
-infra::profile::aem::publish::license_customer_name: 'SIRONA DENTAL SYSTEMS GMBH'
-infra::profile::aem::publish::license_product_name: 'Adobe Experience Manager'
-# echtes admin passswort
 infra::profile::aem::publish::admin_pass: ENC[PKCS7,MIIBiQYJKoZIhvcNAQcDoIIBejCCAXYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAZCjhM/H/XoqufG54YM5hZ1DnFPI/WZdHkQqlRPnyHC0NG+uvloR13ew6ht+IHfAaXQW0oiWEyn6G3TtBQMonknWJBfi2+czQoBlM3/UeiSpICRUjxxbSs5y+THHzrVR6J8AqdY86Wr0vAdGXlx/dTg6RkPRiAUwfrVxxgqTSV5DReUrIi5FQcBlJzyL+33B8KcRjPk2smvkV24y+/mL5qXm2Sck0Ek3V9AfYnTpWZ261PWqgYmC4aI4vx5maprNiQBxlt8PLT9TROvZh9tWp6jmCYkxQZkk8FpqrkjawwgNqMyqPSFo5aKg/pRSMJcNT7ss5eu3W8MtbfKcWPanamzBMBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCJbdvpcLuOqzKOyYyQ0ZPWgCDNlMrXU0uaDq9b5+W5XmMDynR/0mmx1X3KVdksri71DQ==]
-# admin passswort ist admin
-# infra::profile::aem::publish::admin_pass: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAf+Aeig3Iiff8ImsVahdrA5VNMrmt8d6dF+xzhdl6ptL5fxorCRfBmgV1x3Cj48unmv1WM8E+cWHkOXlnjbhEcE3yR63rOMgYJhYAyDzNLnaAQGZvbY8e5Y4xOUY9tblSY78ISyCV/2X9u6JstbpS6L9Fkf5Q3jkW4d2NeO0zbdjlc/uMpZaJskkU+eckdPzZYnfgkKXYjPiVujSNMmV0ZM0Py58HZf9tkTAwMjzmDOZ9BqUgzPcO0EV4Z1ymXi9DK8HxLKbndCnQTRgR6dMXEn+QUTfZbKSc6CekHkNFNWSsTUe4chaIGWG1Aur1Kn14ZKspzbHfyV3muJhxIHIzIzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC5ajaeTDNBFE93ZoxDzvdPgBCslv0jerR9CNBiwe17Sllr]
 infra::profile::aem::publish::oak_version: 1.4.8
 
-#aem::author::install_packages:
-infra::profile::aem::author::instance_name: author
-infra::profile::aem::author::install_mode: 'quickstart'
-infra::profile::aem::author::install_options:
-  download_type: maven
-  download_uri: com.adobe.aem:aem-quickstart:6.2:jar
-infra::profile::aem::author::install_files:
-  org.apache.jackrabbit.oak.plugins.blob.datastore.FileDataStore.cfg:
-    content: |
-      path=./crx-quickstart/repository/datastore
-      minRecordLength=1048576
-  org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.cfg:
-    content: |
-      customBlobStore=true
-  org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.config:
-    content: |
-      repository.home=${repository.home}/segmentstore
-      tarmk.size=256
-      pauseCompaction=B"false"
-
-infra::profile::aem::publish::install_mode: 'quickstart'
-infra::profile::aem::publish::instance_name: publish
-infra::profile::aem::publish::install_options:
-  download_type: maven
-  download_uri: com.adobe.aem:aem-quickstart:6.2:jar
-infra::profile::aem::publish::install_files:
-  org.apache.jackrabbit.oak.plugins.blob.datastore.FileDataStore.cfg:
-    content: |
-      path=./crx-quickstart/repository/datastore
-      minRecordLength=1048576
-  org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.cfg:
-    content: |
-      customBlobStore=true
-  org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.config:
-    content: |
-      repository.home=${repository.home}/segmentstore
-      tarmk.size=256
-      pauseCompaction=B"false"
-
-
 aem::maven::mirrors:
   - {id: pixelpark-nexus, url: 'https://nexus.pixelpark.com/content/groups/public/', mirrorof: '*,!pixelpark-nexus,!sirona-releases,!sirona-snapshots'}
 aem::maven::repos: