From c5742b1f5adb51da6cdbc05fa28e264142d99266 Mon Sep 17 00:00:00 2001 From: hakcosar1 Date: Thu, 6 Jul 2017 12:47:47 +0200 Subject: [PATCH] test install --- customer/cosar-test-customer/common.yaml | 58 ----- customer/cosar-test-customer/development.yaml | 227 ------------------ ...ml => test-aem-siemens.pixelpark.com.yaml} | 6 - customer/cosar-test-customer/test.yaml | 55 +++++ 4 files changed, 55 insertions(+), 291 deletions(-) delete mode 100644 customer/cosar-test-customer/development.yaml rename customer/cosar-test-customer/{cosar-centos.pixelpark.com.yaml => test-aem-siemens.pixelpark.com.yaml} (60%) create mode 100644 customer/cosar-test-customer/test.yaml diff --git a/customer/cosar-test-customer/common.yaml b/customer/cosar-test-customer/common.yaml index a75ba71e..37747506 100644 --- a/customer/cosar-test-customer/common.yaml +++ b/customer/cosar-test-customer/common.yaml @@ -52,61 +52,3 @@ sudo::configs: centos ALL=(ALL) NOPASSWD:ALL ec2-user ALL=(ALL) NOPASSWD:ALL zabbix ALL=(ALL) NOPASSWD:/etc/zabbix/scripts/mailMonitorPubadmin.sh - -# -# Author -# -infra::profile::aem::author::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEANje1elaoXse8wFd4QxETNifOXtNfGTx8sCYCo9ccVZLhnP57XeGxZW1W0HyxVdQK1reoKDwKhFeuOMrrHSL0qd8o6Sg1kP5m/AgnL0Grxfxc8WCQQlHALshpQCYNJNoaLTcSxyYm4IXwXTE9WlhFlyR8g9mQFh04v8SqGtP/zerzN3Dnbl1FUv1P/hX/INHm+yHS2Vnl1LC4p2m6XKUBH0FnwTaG0k/RG3xMsXd78/+tbqqjcBBMQCDLz7vDdV0kzV1dur5bFYY22XV/ya8rh3KZLviaw6xZDYG19FI/4hZxEuvNciAL3Nx78D02nX/gKNmSj8yg7sB9PYX8pSgkcjBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAAYdyd5FPaMFRMFMa+/Wr7gDBEkwnMCMZRX9f8aUCpkwsayki+sY+zshF/67FlAVuqK4Pb3x9fbZ8wbE5mPa0BhZo=] -infra::profile::aem::author::license_product_version: '6.1.0.20150507' -infra::profile::aem::author::license_customer_name: 'Day Training' -infra::profile::aem::author::license_product_name: 'Adobe Experience Manager' - -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' - -#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.1:jar - -# Compaction & Backup for Author -infra::profile::aem::author::oak_version: '1.2.7' -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: - - philipp.dallig@pixelpark.com - -# -# Publisher -# -infra::profile::aem::author::license_download_id: ENC[PKCS7,MIIBmQYJKoZIhvcNAQcDoIIBijCCAYYCAQAxggEhMIIBHQIBADAFMAACAQEwDQYJKoZIhvcNAQEBBQAEggEANje1elaoXse8wFd4QxETNifOXtNfGTx8sCYCo9ccVZLhnP57XeGxZW1W0HyxVdQK1reoKDwKhFeuOMrrHSL0qd8o6Sg1kP5m/AgnL0Grxfxc8WCQQlHALshpQCYNJNoaLTcSxyYm4IXwXTE9WlhFlyR8g9mQFh04v8SqGtP/zerzN3Dnbl1FUv1P/hX/INHm+yHS2Vnl1LC4p2m6XKUBH0FnwTaG0k/RG3xMsXd78/+tbqqjcBBMQCDLz7vDdV0kzV1dur5bFYY22XV/ya8rh3KZLviaw6xZDYG19FI/4hZxEuvNciAL3Nx78D02nX/gKNmSj8yg7sB9PYX8pSgkcjBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAAYdyd5FPaMFRMFMa+/Wr7gDBEkwnMCMZRX9f8aUCpkwsayki+sY+zshF/67FlAVuqK4Pb3x9fbZ8wbE5mPa0BhZo=] -infra::profile::aem::author::license_product_version: '6.1.0.20150507' -infra::profile::aem::author::license_customer_name: 'Day Training' -infra::profile::aem::author::license_product_name: 'Adobe Experience Manager' - -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' - -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 - -# Compaction & Backup for Publisher -infra::profile::aem::publish::oak_version: '1.2.7' -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: - - philipp.dallig@pixelpark.com -# -# dispatcher -# -aem::dispatcher::download_type_options: - groupid: com.adobe.aem - artifactid: dispatcher-apache2.4 - version: 4.2.0 - packaging: so - repos: https://nexus.pixelpark.com/content/groups/public/ - - diff --git a/customer/cosar-test-customer/development.yaml b/customer/cosar-test-customer/development.yaml deleted file mode 100644 index e312ceee..00000000 --- a/customer/cosar-test-customer/development.yaml +++ /dev/null @@ -1,227 +0,0 @@ ---- -# Author -infra::profile::aem::author::license_download_id: ENC[PKCS7,xyz] -infra::profile::aem::author::license_product_version: '6.2.0' -infra::profile::aem::author::license_customer_name: 'test' -infra::profile::aem::author::license_product_name: 'Adobe Experience Manager' -infra::profile::aem::author::admin_pass: ENC[PKCS7,xyz] -infra::profile::aem::author::oak_version: 1.4.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_product_name: 'Adobe Experience Manager' -infra::profile::aem::publish::admin_pass: ENC[PKCS7,xyz] -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/'} -aem::maven::repos: - - nexus-repo: - id: pixelpark-nexus - url: 'https://nexus.pixelpark.com/content/groups/public/' - releases: - enabled: true - - -aem::packages: - cq-6.2.0-hotfix-10870: - groupid: 'com.adobe.aem' - artifactid: 'cq-6.2.0-hotfix-10870' - version: '1.0' - cq-6.2.0-hotfix-10936: - groupid: 'com.adobe.aem' - artifactid: 'cq-6.2.0-hotfix-10936' - version: '1.0' - cq-6.2.0-hotfix-10956: - groupid: 'com.adobe.aem' - artifactid: 'cq-6.2.0-hotfix-10956' - version: '1.2' - cq-6.2.0-hotfix-11099: - groupid: 'com.adobe.aem' - artifactid: 'cq-6.2.0-hotfix-11099' - version: '1.4' - cq-6.2.0-hotfix-11201-package: - groupid: 'com.adobe.aem' - artifactid: 'cq-6.2.0-hotfix-11201-package' - version: '1.2' - cq-6.2.0-hotfix-11490: - groupid: 'com.adobe.aem' - artifactid: 'cq-6.2.0-hotfix-11490' - version: '1.2' - cq-6.2.0-hotfix-11700: - groupid: 'com.adobe.aem' - artifactid: 'cq-6.2.0-hotfix-11700' - version: '1.0' - cq-6.2.0-hotfix-12190: - groupid: 'com.adobe.aem' - artifactid: 'cq-6.2.0-hotfix-12190' - version: '1.0' - cq-6.2.0-hotfix-13011: - groupid: 'com.adobe.aem' - artifactid: 'cq-6.2.0-hotfix-13011' - version: '1.1' - cq-6.2.0-hotfix-13019: - groupid: 'com.adobe.aem' - artifactid: 'cq-6.2.0-hotfix-13019' - version: '1.0' - acs_aem_commons: - groupid: 'com.adobe.acs' - artifactid: 'acs-aem-commons-content' - version: '3.2.6' - acs_aem_tools: - groupid: 'com.adobe.acs' - artifactid: 'acs-aem-tools-content' - version: '0.0.28' - - -aem::enable_https_mapping: true -aem::domain_mappings: - dev01-publish-cosar.pixelpark.net: - aem_path: '/content/test' - create_sling_mapping: true - -# Apache Publisher -infra::profile::aem::publish::pp_vhosts: - cosar: - docroot: '/var/www/html/cache/content/test' - serveraliases: - - dev01-publish-cosar.pixelpark.net - docroot_owner: apache - setenvifnocase: - - 'Accept-Language ^.*$ language=en' - - 'Accept-Language ^de language=de' - headers: - - 'add Access-Control-Allow-Origin %%{ich-trickse}{AccessControlAllowOrigin}e env=AccessControlAllowOrigin' - error_documents: - - { error_code: 404 , document: "/en/error-pages/404.html" } - - { error_code: 500 , document: "/en/error-pages/500.html" } - aliases: - - { alias: /error_custom/ , path: /var/www/html/error_custom/ } - error_documents: - - { error_code: 502 , document: "/error_custom/error.shtml" } - - { error_code: 503 , document: "/error_custom/error.shtml" } - directories: - - docroot: - provider: directory - path: '/var/www/html/cache/content/test' - sethandler: dispatcher-handler - options: - - FollowSymLinks - - error_documents: - provider: directory - path: /var/www/html/error_custom/ - options: - - +Includes - - location1: - provider: location - path: '/' - auth_type: Digest - auth_name: server - auth_digest_provider: file - auth_digest_algorithm: MD5 - auth_user_file: '/etc/httpd/htdigest' - auth_require: 'valid-user' - require: - - 'env AccessControlAllowOrigin' - - de-de: - provider: locationmatch - path: '^/de/' - error_documents: - - { error_code: 404 , document: "/de/error-pages/404.html" } - - { error_code: 500 , document: "/de/error-pages/500.html" } - rewrites: - - language_rewrite: - comment: 'lanugage Rewrite use Env Vars' - rewrite_rule: - - '^/$ %%{ich-trickse}{REQUEST_SCHEME}://dev01-publish-cosar.pixelpark.net/%%{ich-trickse}{ENV:language}.html [R=301,L]' - -# Apache Author -infra::profile::aem::author::pp_vhosts: - cosar: - docroot: '/var/www' - directories: - - docroot: - provider: directory - path: '/var/www/' - - location1: - provider: location - path: '/' - auth_type: Digest - auth_name: www - auth_digest_provider: file - auth_digest_algorithm: MD5 - auth_user_file: '/etc/httpd/htdigest' - auth_require: 'valid-user' - -# Use Alias function if updated to Puppet 4 -aem::dispatcher::publish_farm: -## Flusher - z_invalidation_only: - virtualhosts: - - 'invalidation_only' - renders: - - { hostname: "127.0.0.1", port: '4503' } - filter: - - { type: 'deny', glob: '*' } - - { type: 'allow', glob: '*/content*' } - cache_docroot: '/var/www/html/cache' - cache_rules: - - { type: 'allow', glob: '*' } - cache_invalidate: - - { type: 'deny', glob: '*' } - - { type: 'allow', glob: '*.html' } - - { type: 'allow', glob: '/etc/segmentation.segment.js' } - - { type: 'allow', glob: '*/analytics.sitecatalyst.js' } - cache_allowed_clients: - - { type: 'deny', glob: '*' } - - { type: 'allow', glob: '127.0.0.1' } - cache_statfileslevel: 3 - ids: - virtualhosts: - - 'dev01-publish-cosar.pixelpark.net' - clientheaders: - - '*' - renders: - - { hostname: "127.0.0.1", port: '4503' } - diff --git a/customer/cosar-test-customer/cosar-centos.pixelpark.com.yaml b/customer/cosar-test-customer/test-aem-siemens.pixelpark.com.yaml similarity index 60% rename from customer/cosar-test-customer/cosar-centos.pixelpark.com.yaml rename to customer/cosar-test-customer/test-aem-siemens.pixelpark.com.yaml index fea40440..af74ca33 100644 --- a/customer/cosar-test-customer/cosar-centos.pixelpark.com.yaml +++ b/customer/cosar-test-customer/test-aem-siemens.pixelpark.com.yaml @@ -7,9 +7,3 @@ infra::additional_classes: - infra::profile::aem::author infra::profile::cron::cronjobs: - zfs_rotation: - user: root - command: '/usr/local/sbin/zfs_rotation.sh datapool 2592000' # 30 days - minute: 0 - hour: 2 - description: ZFS Snapshot diff --git a/customer/cosar-test-customer/test.yaml b/customer/cosar-test-customer/test.yaml new file mode 100644 index 00000000..bfe5afc2 --- /dev/null +++ b/customer/cosar-test-customer/test.yaml @@ -0,0 +1,55 @@ +--- +# Author +infra::profile::aem::author::license_download_id: ENC[PKCS7,xyz] +infra::profile::aem::author::license_product_version: '6.2.0' +infra::profile::aem::author::license_customer_name: 'test' +infra::profile::aem::author::license_product_name: 'Adobe Experience Manager' +infra::profile::aem::author::admin_pass: ENC[PKCS7,xyz] +infra::profile::aem::author::oak_version: 1.4.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_product_name: 'Adobe Experience Manager' +infra::profile::aem::publish::admin_pass: ENC[PKCS7,xyz] +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" + -- 2.39.5