diff --git a/apache2.changes b/apache2.changes index 8a9e3aa..5c2e272 100644 --- a/apache2.changes +++ b/apache2.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue May 5 12:36:10 UTC 2015 - kstreitova@suse.com + +- simplify apache2.logrotate, use sharedscripts [bnc#713581] + +------------------------------------------------------------------- +Tue May 5 12:17:21 UTC 2015 - kstreitova@suse.com + +- remove curly brackets around format sequence "%y" in + `stat --format="%{y}" %{SOURCE1}` that caused an incorrect + evaluation. Add escaping to proper spec-cleaner processing in + the future + ------------------------------------------------------------------- Thu Apr 9 15:53:27 UTC 2015 - kstreitova@suse.com diff --git a/apache2.logrotate b/apache2.logrotate index 15bd938..a9d808e 100644 --- a/apache2.logrotate +++ b/apache2.logrotate @@ -1,4 +1,4 @@ -/var/log/apache2/access_log { +/var/log/apache2/access_log /var/log/apache2/ssl_request_log { compress dateext maxage 365 @@ -7,12 +7,14 @@ notifempty missingok create 644 root root + sharedscripts postrotate - systemctl reload apache2.service + systemctl reload apache2.service + sleep 60 endscript } -/var/log/apache2/error_log { +/var/log/apache2/error_log /var/log/apache2/suexec.log /var/log/apache2/ssl_engine_log /var/log/apache2/deflate.log { compress dateext maxage 365 @@ -21,49 +23,9 @@ notifempty missingok create 644 root root + sharedscripts postrotate - systemctl reload apache2.service - endscript -} - -/var/log/apache2/suexec.log { - compress - dateext - maxage 365 - rotate 99 - size=+1024k - notifempty - missingok - create 644 root root - postrotate - systemctl reload apache2.service - endscript -} - -/var/log/apache2/ssl_request_log { - compress - dateext - maxage 365 - rotate 99 - size=+4096k - notifempty - missingok - create 644 root root - postrotate - systemctl reload apache2.service - endscript -} - -/var/log/apache2/ssl_engine_log { - compress - dateext - maxage 365 - rotate 99 - size=+1024k - notifempty - missingok - create 644 root root - postrotate - systemctl reload apache2.service + systemctl reload apache2.service + sleep 60 endscript } diff --git a/apache2.spec b/apache2.spec index aee5c99..740df5c 100644 --- a/apache2.spec +++ b/apache2.spec @@ -324,7 +324,7 @@ cp %{SOURCE24} ./${c##%{name}-} sed 's,(" PLATFORM "),(%{platform_string}),' server/core.c > tmp_file && mv tmp_file server/core.c sed 's/public_html/%{userdir}/g' docs/conf/extra/httpd-userdir.conf.in > tmp_file && mv tmp_file docs/conf/extra/httpd-userdir.conf.in # Use mtime of .changes for build time -CHANGES=`stat --format="%{y}" %{SOURCE1}` +CHANGES=`stat --format="%%y" %{SOURCE1}` sed -i -e "s/__DATE__ \" \" __TIME__;/\"$CHANGES\";/" server/buildmark.c # # now configure Apache