aem params

diff --git a/customer/cosar-test-customer/develeopment.yaml b/customer/cosar-test-customer/develeopment.yaml
index 6d16dc0e5723b05b239f319f8de4169c3af56811..2954b616797338fc743d60205f719058cde98018 100644 (file)
--- a/customer/cosar-test-customer/develeopment.yaml
+++ b/customer/cosar-test-customer/develeopment.yaml
@@ -1,11 +1,6 @@
 ---
 infra::additional_classes:
-  - java
-
-java::oracle: jdk8
-java::oracle:version_major: '8u51'
-java::oracle:version_minor: 'b11'
-java::oracle:java_se: 'jdk'
+  - accounts
 
 # Author
 infra::profile::aem::author::license_download_id: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmRHmcNKDMnSyGxdcJmXgNzN2rKs3o0beFw2ngSBG5JiDFXwm3o8qiYppdy9m+G7tJ75jycJp7uXoN6ejCjXLQhwIZp3+4MjferW6Sik/ib95aw4EsRwE5qbz7Vh3/oKC+RvV09WHlTSuOGxUNktdsS/zTADOBexAmBPljSV3fXX1yPu9H2kjYtZ34JcZIkO8Hmqug5fNWGZo+UsUcViS7jh5K2ZuQ1MiRGMRE4w1Y9ffbF040OF+AI/9kTvfc8vBUggvj1sLgwyoE5IMm0qtvHPUQIqWrrkY5F9sjAMrCpEyxa1ghTQg1XGEcY5OBjDmxA85Gp7feTvvaTkj3AUwWzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDyp1RYBpGRDCBY2ft02xsugBCNhPPi5f7aGGdiSIebuFC3]
@@ -13,19 +8,13 @@ infra::profile::aem::author::license_product_version: '5.6.1.20130606'
 infra::profile::aem::author::license_customer_name: 'SIEMENS AG'
 infra::profile::aem::author::license_product_name: 'Adobe Experience Manager'
 infra::profile::aem::author::admin_pass: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmVzQFFEiOzLFhJDceTBPKdbOzup7PfFlZB0onfQsMCphCwjbGpojA5gk2EcE4avCA14TtyEUxAz+JlU64DhxOiZOrzTy/I9oxXKOkyICnrqEzWcfyaSS4V5goDt1Mw3UhKT7jXxnNrbttMw7w4nGc73D/5Ic6XyWpCQeweQLn90JwF2HUCSUjQkkibLeE+r1bP2FJ8SzK3cdaaMiKRffUyMqtpw7OOb8b3PwiNKhLcjOvo1vVTyF86OBgQp//tzMXksbmfWDmUJyBZpPAnV1uEbgzUc+XNp7mC1dk70Tw0Qnn0g7VTJLUTOCAlql3l8IiggKIyNmQWSs/hcX0KHQLDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCAqq9LK3rNcXns3UXHd29GgBD6GcBlNkkvuR48IZaZe5Ee]
-infra::profile::aem::author::oak_version: 1.4.8
+infra::profile::aem::author::oak_version: 1.6.8
 # Publisher
-infra::profile::aem::publish::license_download_id: ENC[PKCS7,xyz]
-infra::profile::aem::publish::license_product_version: '6.2.0'
-infra::profile::aem::publish::license_customer_name: 'test'
+infra::profile::aem::publish::license_download_id: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmRHmcNKDMnSyGxdcJmXgNzN2rKs3o0beFw2ngSBG5JiDFXwm3o8qiYppdy9m+G7tJ75jycJp7uXoN6ejCjXLQhwIZp3+4MjferW6Sik/ib95aw4EsRwE5qbz7Vh3/oKC+RvV09WHlTSuOGxUNktdsS/zTADOBexAmBPljSV3fXX1yPu9H2kjYtZ34JcZIkO8Hmqug5fNWGZo+UsUcViS7jh5K2ZuQ1MiRGMRE4w1Y9ffbF040OF+AI/9kTvfc8vBUggvj1sLgwyoE5IMm0qtvHPUQIqWrrkY5F9sjAMrCpEyxa1ghTQg1XGEcY5OBjDmxA85Gp7feTvvaTkj3AUwWzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDyp1RYBpGRDCBY2ft02xsugBCNhPPi5f7aGGdiSIebuFC3]
+infra::profile::aem::publish::license_product_version: '5.6.1.20130606'
+infra::profile::aem::publish::license_customer_name: 'SIEMENS AG'
 infra::profile::aem::publish::license_product_name: 'Adobe Experience Manager'
-infra::profile::aem::publish::admin_pass: ENC[PKCS7,xyz]
+infra::profile::aem::publish::admin_pass: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmVzQFFEiOzLFhJDceTBPKdbOzup7PfFlZB0onfQsMCphCwjbGpojA5gk2EcE4avCA14TtyEUxAz+JlU64DhxOiZOrzTy/I9oxXKOkyICnrqEzWcfyaSS4V5goDt1Mw3UhKT7jXxnNrbttMw7w4nGc73D/5Ic6XyWpCQeweQLn90JwF2HUCSUjQkkibLeE+r1bP2FJ8SzK3cdaaMiKRffUyMqtpw7OOb8b3PwiNKhLcjOvo1vVTyF86OBgQp//tzMXksbmfWDmUJyBZpPAnV1uEbgzUc+XNp7mC1dk70Tw0Qnn0g7VTJLUTOCAlql3l8IiggKIyNmQWSs/hcX0KHQLDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCAqq9LK3rNcXns3UXHd29GgBD6GcBlNkkvuR48IZaZe5Ee]
 infra::profile::aem::publish::oak_version: 1.6.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
 

diff --git a/customer/cosar-test-customer/test-aem-siemens.pixelpark.com.yaml b/customer/cosar-test-customer/test-aem-siemens.pixelpark.com.yaml
deleted file mode 100644 (file)
index a9a9d2c..0000000
--- a/customer/cosar-test-customer/test-aem-siemens.pixelpark.com.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
----
-infra::role: base_for_old_systems  # because we don't need xymon
-infra::additional_classes:
-  - accounts
-  - infra::profile::aem::author
-
-infra::profile::aem::author::install_files:
-  org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.cfg:
-    content: |
-      customBlobStore=true
-  org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.config:
-    content: |
-      customBlobStore=B"true"
-  org.apache.jackrabbit.oak.plugins.blob.datastore.SharedS3DataStore.config:
-    content: |
-         accessKey="AKIAIKIDI3KXLZWEONYA"
-         secretKey="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"
-         s3Bucket="pubwebdatadev"
-         s3Region="eu-west-1"
-         s3EndPoint="s3-eu-west-1.amazonaws.com"
-         connectionTimeout="120000"
-         socketTimeout="120000"
-         maxConnections="100"
-         writeThreads="30"
-         maxErrorRetry="10"
-         path="/opt/aem6/dev/publish/crx-quickstart/repository/datastore/"
-         maxCachedBinarySize="34816"
-         cacheSize="107374182400"
-         concurrentUploadsThreads="10"
-         asyncUploadLimit="100"
-         cachePurgeTrigFactor="0.95d"
-         uploadRetries="3"
-  org.apache.jackrabbit.oak.plugins.blob.datastore.S3DataStore.cfg:
-    content: |
-         accessKey=AKIAIKIDI3KXLZWEONYA
-         secretKey=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
-         s3Bucket=pubwebdatadev
-         s3Region=eu-west-1
-         s3EndPoint=s3-eu-west-1.amazonaws.com
-         connectionTimeout=120000
-         socketTimeout=120000
-         maxConnections=100
-         writeThreads=30
-         maxErrorRetry=10
-         path=/opt/aem6/dev/publish/crx-quickstart/repository/datastore/
-         maxCachedBinarySize=34816
-         cacheSize=107374182400
-         concurrentUploadsThreads=10
-         asyncUploadLimit=100
-         cachePurgeTrigFactor=0.95d
-         uploadRetries=3

diff --git a/customer/cosar-test-customer/test-aem-siemens.pixelpark.net.yaml b/customer/cosar-test-customer/test-aem-siemens.pixelpark.net.yaml
new file mode 100644 (file)
index 0000000..ab5fb8e
--- /dev/null
+++ b/customer/cosar-test-customer/test-aem-siemens.pixelpark.net.yaml
@@ -0,0 +1,65 @@
+---
+infra::role: base_for_old_systems  # because we don't need xymon
+infra::additional_classes:
+  - infra::profile::aem::author
+  - java
+  
+java::oracle: jdk8
+java::oracle:version_major: '8u51'
+java::oracle:version_minor: 'b11'
+java::oracle:java_se: 'jdk'    
+
+#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::jvm_opts: '-d64 -Djavax.net.ssl.trustStore=/etc/pki/java/cacerts -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'  
+
+infra::profile::aem::author::install_files:
+  org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.cfg:
+    content: |
+      customBlobStore=true
+  org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.config:
+    content: |
+      customBlobStore=B"true"
+  org.apache.jackrabbit.oak.plugins.blob.datastore.SharedS3DataStore.config:
+    content: |
+         accessKey="AKIAIKIDI3KXLZWEONYA"
+         secretKey="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"
+         s3Bucket="pubwebdatadev"
+         s3Region="eu-west-1"
+         s3EndPoint="s3-eu-west-1.amazonaws.com"
+         connectionTimeout="120000"
+         socketTimeout="120000"
+         maxConnections="100"
+         writeThreads="30"
+         maxErrorRetry="10"
+         path="/opt/aem6/dev/publish/crx-quickstart/repository/datastore/"
+         maxCachedBinarySize="34816"
+         cacheSize="107374182400"
+         concurrentUploadsThreads="10"
+         asyncUploadLimit="100"
+         cachePurgeTrigFactor="0.95d"
+         uploadRetries="3"
+  org.apache.jackrabbit.oak.plugins.blob.datastore.S3DataStore.cfg:
+    content: |
+         accessKey=AKIAIKIDI3KXLZWEONYA
+         secretKey=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
+         s3Bucket=pubwebdatadev
+         s3Region=eu-west-1
+         s3EndPoint=s3-eu-west-1.amazonaws.com
+         connectionTimeout=120000
+         socketTimeout=120000
+         maxConnections=100
+         writeThreads=30
+         maxErrorRetry=10
+         path=/opt/aem6/dev/publish/crx-quickstart/repository/datastore/
+         maxCachedBinarySize=34816
+         cacheSize=107374182400
+         concurrentUploadsThreads=10
+         asyncUploadLimit=100
+         cachePurgeTrigFactor=0.95d
+         uploadRetries=3