siemens

diff --git a/customer/siemens/common.yaml b/customer/siemens/common.yaml
index ce7c078be8339a4e18491a719b24a17e868d1d9e..e42c7dd0b453de074d63bfdbdee2eced9092a7c6 100644 (file)
--- a/customer/siemens/common.yaml
+++ b/customer/siemens/common.yaml
@@ -8,6 +8,8 @@ infra::additional_classes:
   - siemens_puppet_general
   - siemens_puppet_general::pubadmin
   - zabbix::agent
+  - siemens_puppet_general::mcafee
+  - maven  
   
 zabbix::agent::server: '10.200.126.51'
 zabbix::agent::manage_repo: false    
@@ -42,7 +44,7 @@ ntp::statistics:
   - 'loopstats peerstats clockstats'       
         
 sudo::configs:
-  aem:
+  pubadmin:
     priority: "05"
     content: |
       Cmnd_Alias START_PUBLISH = /etc/init.d/aem6-publish start

diff --git a/customer/siemens/liamir501a.publicis.de.yaml b/customer/siemens/liamir501a.publicis.de.yaml
index 73b1da4f2dd2bb05dd2d3775bd59d691da41518b..3bb1e401a2bb4b237853eb42d013feb53faa7f58 100644 (file)
--- a/customer/siemens/liamir501a.publicis.de.yaml
+++ b/customer/siemens/liamir501a.publicis.de.yaml
@@ -1,9 +1,8 @@
 ---
 infra::role: base_for_old_systems  # because we don't need xymon
 infra::additional_classes:
-  - maven
   - infra::profile::aem::author
-  - siemens_puppet_general::mcafee
+  - siemens_puppet_general::apache
 
 aem::base_dir: '/opt/aem6/author_siemens_com'
 aem::backup_dir: '/opt/aem6/author_siemens_com/backup'

diff --git a/customer/siemens/liamir501p.publicis.de.yaml b/customer/siemens/liamir501p.publicis.de.yaml
index 8ea30d45f25db70be075581a354e13eafab0c8f7..d09256243b7b2f7596678cef5a064cfd281c6e14 100644 (file)
--- a/customer/siemens/liamir501p.publicis.de.yaml
+++ b/customer/siemens/liamir501p.publicis.de.yaml
@@ -1,33 +1,31 @@
 ---
 infra::role: base_for_old_systems  # because we don't need xymon
 infra::additional_classes:
-  - maven
-  - infra::profile::aem::author
-  - siemens_puppet_general::mcafee
+  - infra::profile::aem::publish
   - siemens_puppet_general::apache
 
-aem::base_dir: '/opt/aem6/author_siemens_com'
-aem::backup_dir: '/opt/aem6/author_siemens_com/backup'
-aem::tools_dir: '/opt/aem6/author_siemens_com/tools'
+aem::base_dir: '/opt/aem6/publish_siemens_com'
+aem::backup_dir: '/opt/aem6/publish_siemens_com/backup'
+aem::tools_dir: '/opt/aem6/publish_siemens_com/tools'
 
-# 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'
-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.2.18
+# publish
+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,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEAmVzQFFEiOzLFhJDceTBPKdbOzup7PfFlZB0onfQsMCphCwjbGpojA5gk2EcE4avCA14TtyEUxAz+JlU64DhxOiZOrzTy/I9oxXKOkyICnrqEzWcfyaSS4V5goDt1Mw3UhKT7jXxnNrbttMw7w4nGc73D/5Ic6XyWpCQeweQLn90JwF2HUCSUjQkkibLeE+r1bP2FJ8SzK3cdaaMiKRffUyMqtpw7OOb8b3PwiNKhLcjOvo1vVTyF86OBgQp//tzMXksbmfWDmUJyBZpPAnV1uEbgzUc+XNp7mC1dk70Tw0Qnn0g7VTJLUTOCAlql3l8IiggKIyNmQWSs/hcX0KHQLDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCAqq9LK3rNcXns3UXHd29GgBD6GcBlNkkvuR48IZaZe5Ee]
+infra::profile::aem::publish::oak_version: 1.2.18
 
-#aem::author::install_packages:
-infra::profile::aem::author::instance_name: author
-infra::profile::aem::author::install_mode: 'quickstart'
-infra::profile::aem::author::install_options:
+#aem::publish::install_packages:
+infra::profile::aem::publish::instance_name: publish
+infra::profile::aem::publish::install_mode: 'quickstart'
+infra::profile::aem::publish::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::oak_version: 1.2.18
-infra::profile::aem::author::install_files:
+infra::profile::aem::publish::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::publish::oak_version: 1.2.18
+infra::profile::aem::publish::install_files:
   org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.cfg:
     content: |
       customBlobStore=true