From eca55dd42a19d1c06e545b86d4fb3955e55eeac7 Mon Sep 17 00:00:00 2001 From: Robert Waffen Date: Fri, 14 Sep 2018 17:06:12 +0200 Subject: [PATCH] fix lint for siemens --- customer/siemens/common.yaml | 22 +++++++++---------- customer/siemens/development.yaml | 8 +++---- customer/siemens/int.yaml | 2 -- customer/siemens/liamir501a.publicis.de.yaml | 5 ++--- customer/siemens/liamir501p.publicis.de.yaml | 5 ++--- customer/siemens/production.yaml | 2 -- customer/siemens/stage.yaml | 2 -- .../test-aem-siemens.pixelpark.net.yaml | 7 +++--- 8 files changed, 21 insertions(+), 32 deletions(-) diff --git a/customer/siemens/common.yaml b/customer/siemens/common.yaml index ba5403bc..2de4701e 100644 --- a/customer/siemens/common.yaml +++ b/customer/siemens/common.yaml @@ -4,15 +4,15 @@ infra::additional_classes: - accounts # - java - infra::profile::cron - - repo::redhat::passenger + - repo::redhat::passenger - siemens_puppet_general - siemens_puppet_general::pubadmin - zabbix::agent - siemens_puppet_general::mcafee -# - maven - +# - maven + zabbix::agent::server: '10.200.126.51' -zabbix::agent::manage_repo: false +zabbix::agent::manage_repo: false infra::profile::aem::author::backup_command: '/bin/echo "test"' infra::profile::aem::publish::backup_command: '/bin/echo "test"' @@ -24,7 +24,7 @@ ntp::servers: - '0.pool.ntp.org iburst minpoll 6 maxpoll 10' - '1.pool.ntp.org iburst minpoll 6 maxpoll 10' - '2.pool.ntp.org iburst minpoll 6 maxpoll 10' - - '3.pool.ntp.org iburst minpoll 6 maxpoll 10' + - '3.pool.ntp.org iburst minpoll 6 maxpoll 10' ntp::restrict: - '0.pool.ntp.org nomodify notrap noquery' - '1.pool.ntp.org nomodify notrap noquery' @@ -33,16 +33,16 @@ ntp::restrict: - 'default kod notrap nomodify nopeer noquery' - '127.0.0.1 nomodify' - '-6 default kod notrap nomodify nopeer noquery' - - '-6 ::1 nomodify' + - '-6 ::1 nomodify' ntp::disable_monitor: false -ntp::statsdir: '/var/log/ntpstats/' +ntp::statsdir: '/var/log/ntpstats/' ntp::tinker: true -ntp::stepout: 900 +ntp::stepout: 900 ntp::leapfile: '/etc/ntp.leapseconds' ntp::driftfile: '/var/lib/ntp/ntp.drift' -ntp::statistics: - - 'loopstats peerstats clockstats' - +ntp::statistics: + - 'loopstats peerstats clockstats' + sudo::configs: pubadmin: priority: "05" diff --git a/customer/siemens/development.yaml b/customer/siemens/development.yaml index 7f221f96..35b40b2e 100644 --- a/customer/siemens/development.yaml +++ b/customer/siemens/development.yaml @@ -1,7 +1,7 @@ --- -#infra::additional_classes: -# - accounts - +# infra::additional_classes: +# - accounts + aem::base_dir: '/opt/aem' aem::user: 'pubadmin' aem::group: 'pubadmin' @@ -22,5 +22,3 @@ 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 - - diff --git a/customer/siemens/int.yaml b/customer/siemens/int.yaml index d8b75636..7927c6d0 100644 --- a/customer/siemens/int.yaml +++ b/customer/siemens/int.yaml @@ -22,5 +22,3 @@ 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 - - diff --git a/customer/siemens/liamir501a.publicis.de.yaml b/customer/siemens/liamir501a.publicis.de.yaml index 3bb1e401..c8009d91 100644 --- a/customer/siemens/liamir501a.publicis.de.yaml +++ b/customer/siemens/liamir501a.publicis.de.yaml @@ -16,15 +16,14 @@ 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 -#aem::author::install_packages: +# 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::oak_version: 1.2.18 +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: | diff --git a/customer/siemens/liamir501p.publicis.de.yaml b/customer/siemens/liamir501p.publicis.de.yaml index d0925624..7469da9f 100644 --- a/customer/siemens/liamir501p.publicis.de.yaml +++ b/customer/siemens/liamir501p.publicis.de.yaml @@ -16,15 +16,14 @@ 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::publish::install_packages: +# 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::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::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::install_files: org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.cfg: content: | diff --git a/customer/siemens/production.yaml b/customer/siemens/production.yaml index d8b75636..7927c6d0 100644 --- a/customer/siemens/production.yaml +++ b/customer/siemens/production.yaml @@ -22,5 +22,3 @@ 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 - - diff --git a/customer/siemens/stage.yaml b/customer/siemens/stage.yaml index d8b75636..7927c6d0 100644 --- a/customer/siemens/stage.yaml +++ b/customer/siemens/stage.yaml @@ -22,5 +22,3 @@ 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 - - diff --git a/customer/siemens/test-aem-siemens.pixelpark.net.yaml b/customer/siemens/test-aem-siemens.pixelpark.net.yaml index 55545d17..970e86bf 100644 --- a/customer/siemens/test-aem-siemens.pixelpark.net.yaml +++ b/customer/siemens/test-aem-siemens.pixelpark.net.yaml @@ -1,6 +1,6 @@ --- infra::role: base_for_old_systems # because we don't need xymon -infra::additional_classes: +infra::additional_classes: - java - siemens_puppet_general::java - maven @@ -29,15 +29,14 @@ 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 -#aem::author::install_packages: +# 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::oak_version: 1.2.18 +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: | -- 2.39.5