s3 params

diff --git a/customer/cosar-test-customer/common.yaml b/customer/cosar-test-customer/common.yaml
index 0b156cca2fefedcd1b29c69f9e6b99016ec41922..fbb89f94c6b3577f899e51fc914a721b6c25cff9 100644 (file)
--- a/customer/cosar-test-customer/common.yaml
+++ b/customer/cosar-test-customer/common.yaml
@@ -1,15 +1,9 @@
 ---
 infra::role: base_for_old_systems
 infra::additional_classes:
-  - java
   - accounts
   - infra::profile::cron
 
-java::oracle: jdk8
-java::oracle:version_major: '8u51'
-java::oracle:version_minor: 'b11'
-java::oracle:java_se: 'jdk'
-
 puppetconf::server: puppetmaster01.pixelpark.com
 
 ntp::servers:

diff --git a/customer/cosar-test-customer/develeopment.yaml b/customer/cosar-test-customer/develeopment.yaml
index 3ed6633141844f5416b71dad0d190e39b85377db..6d16dc0e5723b05b239f319f8de4169c3af56811 100644 (file)
--- a/customer/cosar-test-customer/develeopment.yaml
+++ b/customer/cosar-test-customer/develeopment.yaml
@@ -1,4 +1,12 @@
 ---
+infra::additional_classes:
+  - java
+
+java::oracle: jdk8
+java::oracle:version_major: '8u51'
+java::oracle:version_minor: 'b11'
+java::oracle:java_se: 'jdk'
+
 # Author
 infra::profile::aem::author::license_download_id: ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmRHmcNKDMnSyGxdcJmXgNzN2rKs3o0beFw2ngSBG5JiDFXwm3o8qiYppdy9m+G7tJ75jycJp7uXoN6ejCjXLQhwIZp3+4MjferW6Sik/ib95aw4EsRwE5qbz7Vh3/oKC+RvV09WHlTSuOGxUNktdsS/zTADOBexAmBPljSV3fXX1yPu9H2kjYtZ34JcZIkO8Hmqug5fNWGZo+UsUcViS7jh5K2ZuQ1MiRGMRE4w1Y9ffbF040OF+AI/9kTvfc8vBUggvj1sLgwyoE5IMm0qtvHPUQIqWrrkY5F9sjAMrCpEyxa1ghTQg1XGEcY5OBjDmxA85Gp7feTvvaTkj3AUwWzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDyp1RYBpGRDCBY2ft02xsugBCNhPPi5f7aGGdiSIebuFC3]
 infra::profile::aem::author::license_product_version: '5.6.1.20130606'
@@ -12,7 +20,7 @@ infra::profile::aem::publish::license_product_version: '6.2.0'
 infra::profile::aem::publish::license_customer_name: 'test'
 infra::profile::aem::publish::license_product_name: 'Adobe Experience Manager'
 infra::profile::aem::publish::admin_pass: ENC[PKCS7,xyz]
-infra::profile::aem::publish::oak_version: 1.4.8
+infra::profile::aem::publish::oak_version: 1.6.8
 
 #aem::author::install_packages:
 infra::profile::aem::author::instance_name: author
@@ -20,36 +28,4 @@ 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"
 

diff --git a/customer/cosar-test-customer/liamir03p.publicis.de.yaml b/customer/cosar-test-customer/liamir03p.publicis.de.yaml
new file mode 100644 (file)
index 0000000..b33964e
--- /dev/null
+++ b/customer/cosar-test-customer/liamir03p.publicis.de.yaml
@@ -0,0 +1,56 @@
+---
+infra::role: base_for_old_systems  # because we don't need xymon
+infra::additional_classes:
+  - accounts
+  - infra::profile::aem::publish
+
+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.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         
\ No newline at end of file

diff --git a/customer/cosar-test-customer/test-aem-siemens.pixelpark.com.yaml b/customer/cosar-test-customer/test-aem-siemens.pixelpark.com.yaml
index 80a1a0c0f3e5a59ce06d5acae90fff0f1d5ffeb7..a9a9d2c4e56b5d23231c2d863709707082198342 100644 (file)
--- a/customer/cosar-test-customer/test-aem-siemens.pixelpark.com.yaml
+++ b/customer/cosar-test-customer/test-aem-siemens.pixelpark.com.yaml
@@ -2,7 +2,50 @@
 infra::role: base_for_old_systems  # because we don't need xymon
 infra::additional_classes:
   - accounts
-  # Disable because of extra 7.3 download path
-  #  - repo::redhat::zfs
   - 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