amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-19 20:09:28 +00:00
Code Issues Projects Releases Wiki Activity

propagate from branch 'ca.inverse.sogo.1_3_16' (head a7e3713b79d3ec5043152d79550eec23b2ff854f)

Browse Source 
to branch 'ca.inverse.sogo' (head 1e818dce6a38dc4685756dd72c228642032fb6b0)

Monotone-Parent: 1e818dce6a38dc4685756dd72c228642032fb6b0
Monotone-Parent: a7e3713b79d3ec5043152d79550eec23b2ff854f
Monotone-Revision: b293c0227fba2b5897bfbdad32b4ca68f9773305

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-05-24T18:26:44
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Jean Raby
2012-05-24 18:26:44 +00:00
parent bcc391bc44 6aed6c5ed0
commit e6718fcd94
7 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Apache/SOGo.conf
View File

@@ -9,6 +9,13 @@ AliasMatch /SOGo/so/ControlPanel/Products/(.*)/Resources/(.*) \
AllowOverride None
Order deny,allow
Allow from all
# Explicitly allow caching of static content to avoid browser specific behavior.
# A resource's URL MUST change in order to have the client load the new version.
<IfModule expires_module>
ExpiresActive On
ExpiresDefault "access plus 1 year"
</IfModule>
</Directory>
<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*\.(jpg|png|gif|css|js)">
@@ -64,4 +71,4 @@ ProxyPass /SOGo http://127.0.0.1:20000/SOGo retry=0
# The remote address will appear in SOGo's log files and in the X-Forward
# header of emails.
RewriteEngine On
RewriteRule ^/SOGo/(.*)$ /SOGo/$1 [env=REMOTE_HOST:%{REMOTE_ADDR},PT]
RewriteRule ^/SOGo/(.*)$ /SOGo/$1 [env=REMOTE_HOST:%{REMOTE_ADDR},PT]

13
ChangeLog
View File

@@ -1,3 +1,16 @@
2012-05-24 Jean Raby <jraby@inverse.ca>
* debian*/rules: Restart sogod after pkg upgrade (dh_installinit -R)
* Scripts/sogo-init.d-*: add support for conditional restart.
Patch from Romain Le Disez
* sogo.spec: Restart sogod during post installation if it was already running
* Apache/SOGo.conf:
Use mod_expires to allow long term caching of static content. (1 year)
Note that from now on, a resource's URL _must_ change to let the client
reload it. This is now done automatically for 'rsrc' in the wox templates,
but must be done manually for files referenced from css and js.
2012-05-23 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/WebServerResources/generic.js

7
Scripts/sogo-init.d-redhat
View File

@@ -146,12 +146,17 @@ case "$1" in
restart)
restart
;;
condrestart|try-restart)
if status -p "$PIDFILE" $DAEMON >&/dev/null; then
restart
fi
;;
status)
status -p "$PIDFILE" $DAEMON
;;
*)
N=/etc/init.d/$NAME
echo "Usage: $N {start|stop|restart|status}" >&2
echo "Usage: $N {start|stop|restart|condrestart|status}" >&2
exit 1
;;
esac

7
Scripts/sogo-init.d-sles
View File

@@ -96,6 +96,11 @@ case "$1" in
startproc -u $USER $DAEMON $DAEMON_OPTS || true
echo "$NAME."
;;
condrestart|try-restart)
if checkproc -p "$PIDFILE" $DAEMON >&/dev/null; then
restart
fi
;;
status)
checkproc -p $PIDFILE $DAEMON
result="$?"
@@ -115,7 +120,7 @@ case "$1" in
fi
;;
*)
echo "Usage: $NAME {start|stop|restart|status}" >&2
echo "Usage: $NAME {start|stop|restart|condrestart|status}" >&2
exit 1
;;
esac

2
debian-multiarch/rules
View File

@@ -85,7 +85,7 @@ install-arch: build-arch
binary-arch: build-arch install-arch
dh_testdir
dh_testroot
dh_installinit -r
dh_installinit -R
dh_installlogrotate
dh_installcron
dh_installchangelogs ChangeLog

2
debian/rules vendored
View File

@@ -84,7 +84,7 @@ install-arch: build-arch
binary-arch: build-arch install-arch
dh_testdir
dh_testroot
dh_installinit -r
dh_installinit -R
dh_installlogrotate
dh_installcron
dh_installchangelogs ChangeLog

4
sogo.spec
View File

@@ -292,6 +292,7 @@ if ! id sogo >& /dev/null; then /usr/sbin/adduser sogo > /dev/null 2>&1; fi
# update timestamp on imgs,css,js to let apache know the files changed
find %{_libdir}/GNUstep/SOGo/WebServerResources -exec touch {} \;
/sbin/chkconfig --add sogod
/etc/init.d/sogod condrestart >&/dev/null
%preun
if [ "$1" == "0" ]
@@ -311,6 +312,9 @@ fi
# ********************************* changelog *************************
%changelog
* Fri May 24 2012 Jean Raby <jraby@inverse.ca>
- %post: restart sogo if it was running before rpm install
* Fri Mar 16 2012 Jean Raby <jraby@inverse.ca>
- %post: update timestamp on imgs,css,js to let apache know the files changed