rpm/apache2
SHA256
1
0
Fork 0
forked from pool/apache2
Code Pull Requests Activity

Accepting request 295249 from Apache

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/295249
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache2?expand=0&rev=102
This commit is contained in:
Dominique Leuenberger 2015-04-11 22:09:47 +00:00 committed by Git OBS Bridge
commit 58518dff20
4 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apache2.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Thu Apr 9 15:53:27 UTC 2015 - kstreitova@suse.com
- remove 'exit 0' from the %post section in the specfile that was
placed here incorrectly and caused that the rest of the %post
section couldn't be executed.
-------------------------------------------------------------------
Thu Apr 9 13:12:46 UTC 2015 - pgajdos@suse.com
- /etc/init.d/apache2 reload -> systemctl reload apache2.service
in apache2.logrotate [bnc#926523]
-------------------------------------------------------------------
Mon Mar 30 08:42:07 UTC 2015 - pgajdos@suse.com
- authz_default -> authz_core in sysconfig.apache2/APACHE_MODULES
[bnc#922236]
-------------------------------------------------------------------
Tue Mar 10 17:16:21 UTC 2015 - dimstar@opensuse.org

10
apache2.logrotate
View File

@ -8,7 +8,7 @@
missingok
create 644 root root
postrotate
/etc/init.d/apache2 reload
systemctl reload apache2.service
endscript
}
@ -22,7 +22,7 @@
missingok
create 644 root root
postrotate
/etc/init.d/apache2 reload
systemctl reload apache2.service
endscript
}
@ -36,7 +36,7 @@
missingok
create 644 root root
postrotate
/etc/init.d/apache2 reload
systemctl reload apache2.service
endscript
}
@ -50,7 +50,7 @@
missingok
create 644 root root
postrotate
/etc/init.d/apache2 reload
systemctl reload apache2.service
endscript
}
@ -64,6 +64,6 @@
missingok
create 644 root root
postrotate
/etc/init.d/apache2 reload
systemctl reload apache2.service
endscript
}

1
apache2.spec
View File

@ -1295,7 +1295,6 @@ if [ $1 -gt 1 ] ; then
chown --reference=./%{sysconfdir}/httpd.conf $tmpfile
cmp -s $tmpfile ./%{sysconfdir}/httpd.conf || cp -p $tmpfile ./%{sysconfdir}/httpd.conf
fi
exit 0
rm -rf $tmpdir
%{_datadir}/%{name}/apache-20-22-upgrade

2
sysconfig.apache2
View File

@ -79,7 +79,7 @@ APACHE_CONF_INCLUDE_DIRS=""
# apache's default installation
# APACHE_MODULES="authz_host actions alias asis auth autoindex cgi dir imap include log_config mime negotiation setenvif status userdir"
# your settings
APACHE_MODULES="actions alias auth_basic authn_file authz_host authz_groupfile authz_default authz_user autoindex cgi dir env expires include log_config mime negotiation setenvif ssl socache_shmcb userdir php5 reqtimeout"
APACHE_MODULES="actions alias auth_basic authn_file authz_host authz_groupfile authz_core authz_user autoindex cgi dir env expires include log_config mime negotiation setenvif ssl socache_shmcb userdir php5 reqtimeout"
## Type: string