From: hakcosar1 <hakan.cosar@publicispixelpark.de>
Date: Thu, 6 Jul 2017 08:38:01 +0000 (+0200)
Subject: general
X-Git-Tag: v0.1.0~2717
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=cfe08e1d108a6b2f93ec69550467ccaa95e3084d;p=pixelpark%2Fhiera.git

general
---

diff --git a/customer/cosar-test-customer/common.yaml b/customer/cosar-test-customer/common.yaml
index 41e9f322..a75ba71e 100644
--- a/customer/cosar-test-customer/common.yaml
+++ b/customer/cosar-test-customer/common.yaml
@@ -5,17 +5,37 @@ infra::additional_classes:
   - accounts
   - infra::profile::cron
 
-java::package: java-1.8.0-oraclejdk
+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:
-  - '0.centos.pool.ntp.org'
-  - '1.centos.pool.ntp.org'
-  - '2.centos.pool.ntp.org'
-
-accounts::users:
-  sirona:
-    apply: false
+  - '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'  
+ntp::restrict:
+  - '0.pool.ntp.org nomodify notrap noquery'
+  - '1.pool.ntp.org nomodify notrap noquery'
+  - '2.pool.ntp.org nomodify notrap noquery'
+  - '3.pool.ntp.org nomodify notrap noquery'
+  - 'default kod notrap nomodify nopeer noquery'
+  - '127.0.0.1 nomodify'
+  - '-6 default kod notrap nomodify nopeer noquery'
+  - '-6 ::1 nomodify'  
+ntp::tinker:          
+  - '/var/log/ntpstats/'
+ntp::statsdir:  
+  - '/var/log/ntpstats/' 
+ntp::tinker:          
+  - 'panic 0 allan 1500 dispersion 15 step 0.128 stepout 900'
+ntp::leapfile:          
+  - '/etc/ntp.leapseconds'
+ntp::driftfile:          
+  - '/var/lib/ntp/ntp.drift'      
 
 sudo::configs:
   aem:
@@ -28,13 +48,10 @@ sudo::configs:
       Cmnd_Alias STOP_AUTHOR = /usr/bin/systemctl stop author
       Cmnd_Alias STOP_PUPPET = /usr/bin/systemctl stop puppet
       Cmnd_Alias BACKUP = /usr/local/sbin/zfs_rotation.sh*
-      aem ALL=(ALL) NOPASSWD:START_PUBLISH, START_AUTHOR, START_PUPPET, STOP_PUBLISH, STOP_AUTHOR, STOP_PUPPET, BACKUP
-  xymon:
-    priority: "05"
-    content: |
-      Cmnd_Alias ZPOOL = /sbin/zpool list *
-      Cmnd_Alias ZFS = /sbin/zfs list
-      xymon ALL=(ALL) NOPASSWD:ZPOOL, ZFS
+      pubadmin ALL=(ALL) NOPASSWD:ALL
+      centos ALL=(ALL) NOPASSWD:ALL
+      ec2-user ALL=(ALL) NOPASSWD:ALL
+      zabbix ALL=(ALL) NOPASSWD:/etc/zabbix/scripts/mailMonitorPubadmin.sh
 
 #
 # Author