pool/apache2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 305442 from home:kstreitova:branches:Apache

Browse Source 
- simplify apache2.logrotate, use sharedscripts [bnc#713581]

- 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

OBS-URL: https://build.opensuse.org/request/show/305442
OBS-URL: https://build.opensuse.org/package/show/Apache/apache2?expand=0&rev=443
This commit is contained in:
Kristyna Streitova 2015-05-05 14:04:17 +00:00 committed by Git OBS Bridge
parent 70524cd248
commit c1c669e98d
3 changed files with 22 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apache2.changes
View File

@ -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

54
apache2.logrotate
View File

@ -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
}

2
apache2.spec
View File

@ -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