Changed logrotating for chrony

diff --git a/basic/chrony.sls b/basic/chrony.sls
index cde9053f7ae308c6428dd26078b4594a2d122d1f..0aa11a9232c540eb26025b7d32874403ed04eaa4 100644 (file)
--- a/basic/chrony.sls
+++ b/basic/chrony.sls
@@ -1,7 +1,7 @@
 
 chrony:
   pkg:
-    - installed
+    - latest
   service:
     - running
     - enable: True
@@ -69,20 +69,6 @@ chrony-logswitch-script-parent:
     - group: staff
     - dir_mode: 2775
 
-chrony-logswitch-script:
-  file.managed:
-    - name: /usr/local/bin/rotate-chrony
-    - source: salt://basic/files/rotate-chrony
-    - user: root
-    - group: staff
-    - mode: 755
-    - template: jinja
-    - backup: minion
-    - require:
-      - pkg: chrony
-      - file: chrony-logswitch-script-parent
-      - file: /etc/chrony/chrony.keys
-
 /etc/logrotate.d/chrony:
   file.managed:
     - user: root
@@ -95,5 +81,4 @@ chrony-logswitch-script:
       - test -d /etc/logrotate.d
     - require:
       - pkg: chrony
-      - file: chrony-logswitch-script
 

diff --git a/basic/files/chrony.logrotate b/basic/files/chrony.logrotate
index 5b3758e619b4833234d76c13a3c987fd0e2a8d40..355118eaeadfa53abcc01533b31e31d518db971d 100644 (file)
--- a/basic/files/chrony.logrotate
+++ b/basic/files/chrony.logrotate
@@ -10,6 +10,6 @@
        sharedscripts
        create 644
        postrotate
-               /usr/local/bin/rotate-chrony
+               /usr/bin/chronyc -a cyclelogs > /dev/null 2>&1 || true
        endscript
 }

diff --git a/postfix/common.sls b/postfix/common.sls
index 6847f1d72173188134a4c04bbb8fe9965d69954b..9578cbe27515431971611a40f0ff7c910deaa56b 100644 (file)
--- a/postfix/common.sls
+++ b/postfix/common.sls
@@ -23,6 +23,108 @@ postfix-pkgs:
     - require:
       - pkg: postfix
 
+#      - postfix-pgsql
+#      - postfix-pcre
+#      - sasl2-bin
+#      - postfix-cdb
+#      - heirloom-mailx
+#      - dovecot-sieve
+#      - dovecot-pgsql
+#      - dovecot-imapd
+#      - dovecot-pop3d
+#      - dovecot-lmtpd
+#      - mutt
+#      - amavisd-new
+#      - clamav
+#      - clamav-daemon
+#      - clamdscan
+#      - altermime
+#      - ripole
+#      - arj
+#      - cabextract
+#      - dovecot-antispam
+#      - spamassassin
+#      - spamc
+#      - sa-compile
+#      - lhasa
+#      - lzop
+#      - p7zip
+#      - rpm
+#      - unrar
+#      - pyzor
+#      - postgrey
+#      - policyd-weight
+#      - zip
+#      - zoo
+#      - unzip
+#      - alien
+#      - rpm-i18n
+#      - libio-string-perl
+#      - libnet-ident-perl
+#      - build-essential
+#      - libalgorithm-merge-perl
+#      - libalgorithm-diff-xs-perl
+#      - libfile-fcntllock-perl
+#      - libhtml-format-perl
+#      - libhtml-form-perl
+#      - libmail-sendmail-perl
+#      - libnet-rblclient-perl
+#      - libparse-syslog-perl
+#      - libmail-spf-perlpostfix
+#      - procmail
+#      - postfix-pgsql
+#      - postfix-pcre
+#      - sasl2-bin
+#      - postfix-cdb
+#      - heirloom-mailx
+#      - dovecot-sieve
+#      - dovecot-pgsql
+#      - dovecot-imapd
+#      - dovecot-pop3d
+#      - dovecot-lmtpd
+#      - mutt
+#      - amavisd-new
+#      - clamav
+#      - clamav-daemon
+#      - clamdscan
+#      - altermime
+#      - ripole
+#      - arj
+#      - cabextract
+#      - dovecot-antispam
+#      - spamassassin
+#      - spamc
+#      - sa-compile
+#      - lhasa
+#      - lzop
+#      - p7zip
+#      - rpm
+#      - unrar
+#      - pyzor
+#      - postgrey
+#      - policyd-weight
+#      - zip
+#      - zoo
+#      - unzip
+#      - alien
+#      - rpm-i18n
+#      - libio-string-perl
+#      - libnet-ident-perl
+#      - build-essential
+#      - libalgorithm-merge-perl
+#      - libalgorithm-diff-xs-perl
+#      - libfile-fcntllock-perl
+#      - libhtml-format-perl
+#      - libhtml-form-perl
+#      - libmail-sendmail-perl
+#      - libnet-rblclient-perl
+#      - libparse-syslog-perl
+#      - libmail-spf-perl
+#      - liblz4-tool
+#      - unar
+#      - unrar-free
+#      - arc
+
 /etc/postfix:
   file.directory:
     - user: root