diff --git a/salt/profile/countdown/apache.sls b/salt/profile/countdown/apache.sls index 61f670f..8b0e23a 100644 --- a/salt/profile/countdown/apache.sls +++ b/salt/profile/countdown/apache.sls @@ -27,9 +27,4 @@ sysconfig_apache2_countdown: # This is handled in /etc/logrotate.d/apache2 since Leap 15.x (same/duplicate entry there) # removing the file on newer Leap versions to avoid errors in logrotate (duplicate entry...) /etc/logrotate.d/apache2-vhosts: -{% if salt['grains.get']('osfullname') == "Leap" and salt['grains.get']('osmajorrelease')|int >= 15 %} file.absent -{% else %} - file.managed: - - source: salt://profile/wiki/files/apache2-wiki.logrotate -{% endif %} diff --git a/salt/profile/wiki/apache.sls b/salt/profile/wiki/apache.sls index 38fba05..3985550 100644 --- a/salt/profile/wiki/apache.sls +++ b/salt/profile/wiki/apache.sls @@ -29,9 +29,4 @@ apache2_running: # This is handled in /etc/logrotate.d/apache2 since Leap 15.x (same/duplicate entry there) # removing the file on newer Leap versions to avoid errors in logrotate (duplicate entry...) /etc/logrotate.d/apache2-wiki: -{% if salt['grains.get']('osfullname') == "Leap" and salt['grains.get']('osmajorrelease')|int >= 15 %} file.absent -{% else %} - file.managed: - - source: salt://profile/wiki/files/apache2-wiki.logrotate -{% endif %} diff --git a/salt/profile/wiki/files/apache2-wiki.logrotate b/salt/profile/wiki/files/apache2-wiki.logrotate deleted file mode 100644 index 77e9011..0000000 --- a/salt/profile/wiki/files/apache2-wiki.logrotate +++ /dev/null @@ -1,21 +0,0 @@ -# -# This is handled in /etc/logrotate.d/apache2 -# since Leap 15.2 (same/duplicate entry there) -# disabling here for reference and to avoid -# errors in logrotate (duplicate entry...) -# -#/var/log/apache2/*-access_log { -# compress -# dateext -# maxage 365 -# rotate 99 -# size=+4096k -# notifempty -# missingok -# create 644 root root -# sharedscripts -# postrotate -# systemctl reload apache2.service -# sleep 60 -# endscript -#}