Monotone-Parent: c54d8d94c481e0cfc4efd1ad03e95f6d10110d10

Monotone-Revision: a1701b3f7bd858b1fc0810b5313e8648bfcb42f6

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-03-19T01:22:09
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2009-03-19 01:22:09 +00:00
parent 50dbc4e2a5
commit e347f36a5b
6 changed files with 38 additions and 39 deletions

View File

@ -1,9 +1,9 @@
Alias /sogo.woa/WebServerResources/ \ Alias /sogo.woa/WebServerResources/ \
/usr/GNUstep/System/Library/SOGo-0.9/WebServerResources/ /usr/GNUstep/System/Library/SOGo/WebServerResources/
Alias /SOGo.woa/WebServerResources/ \ Alias /SOGo.woa/WebServerResources/ \
/usr/GNUstep/System/Library/SOGo-0.9/WebServerResources/ /usr/GNUstep/System/Library/SOGo/WebServerResources/
Alias /SOGO.woa/WebServerResources/ \ Alias /SOGO.woa/WebServerResources/ \
/usr/GNUstep/System/Library/SOGo-0.9/WebServerResources/ /usr/GNUstep/System/Library/SOGo/WebServerResources/
<LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*jpg"> <LocationMatch "^/SOGo/so/ControlPanel/Products/.*UI/Resources/.*jpg">
SetHandler default-handler SetHandler default-handler
@ -26,7 +26,7 @@ Alias /SOGO.woa/WebServerResources/ \
</LocationMatch> </LocationMatch>
AliasMatch /SOGo/so/ControlPanel/Products/(.*)/Resources/(.*) \ AliasMatch /SOGo/so/ControlPanel/Products/(.*)/Resources/(.*) \
/usr/GNUstep/System/Library/SOGo-0.9/$1.SOGo/Resources/$2 /usr/GNUstep/System/Library/SOGo/$1.SOGo/Resources/$2
<Proxy balancer://sogocluster> <Proxy balancer://sogocluster>
BalancerMember http://127.0.0.1:20000 retry=1 max=1 timeout=120 BalancerMember http://127.0.0.1:20000 retry=1 max=1 timeout=120

View File

@ -53,7 +53,7 @@ Apache Setup
============ ============
AliasMatch /SOGoHH/so/ControlPanel/Products/(.*)/Resources/(.*) \ AliasMatch /SOGoHH/so/ControlPanel/Products/(.*)/Resources/(.*) \
/home/helge/GNUstep/Library/SOGo-0.9/$1.SOGo/Resources/$2 /home/helge/GNUstep/Library/SOGo/$1.SOGo/Resources/$2
<LocationMatch "^/SOGoHH*"> <LocationMatch "^/SOGoHH*">
AuthName "Agenor LDAP" AuthName "Agenor LDAP"
@ -74,15 +74,15 @@ Apache Setup
FHS Setup FHS Setup
========= =========
NOTE: use the appname, sogo-0.9, not the tool name (sogod-0.9)! NOTE: use the appname, sogo, not the tool name (sogod)!
cd /usr/local/share cd /usr/local/share
mkdir sogo-0.9/ mkdir sogo/
cd sogo-0.9/ cd sogo/
ln -s ~/dev/SOGo-trunk/UI/Templates ./templates ln -s ~/dev/SOGo-trunk/UI/Templates ./templates
ln -s ~/dev/SOGo-trunk/UI/WebServerResources ./www ln -s ~/dev/SOGo-trunk/UI/WebServerResources ./www
Apache: Apache:
Alias /SOGo.woa/WebServerResources/ \ Alias /SOGo.woa/WebServerResources/ \
/usr/local/share/sogo-0.9/www/ /usr/local/share/sogo/www/

View File

@ -29,7 +29,7 @@ SOGO_ARGS=""
PATH=/sbin:/bin:/usr/sbin:/usr/bin PATH=/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/sbin/sogod-0.9 DAEMON=/usr/sbin/sogod
NAME=sogo NAME=sogo
DESC="Scalable OpenGroupware.Org" DESC="Scalable OpenGroupware.Org"

View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# chkconfig: 2345 85 15 # chkconfig: 2345 85 15
# description: SOGo is a groupware server # description: SOGo is a groupware server
# processname: sogod-0.9 # processname: sogod
# config: /etc/sysconfig/sogo # config: /etc/sysconfig/sogo
# config: /etc/httpd/conf.d/SOGo.conf # config: /etc/httpd/conf.d/SOGo.conf
# pidfile: /var/run/sogo/sogod.pid # pidfile: /var/run/sogo/sogod.pid
@ -42,7 +42,7 @@ then
. /usr/GNUstep/System/Library/Makefiles/GNUstep.sh . /usr/GNUstep/System/Library/Makefiles/GNUstep.sh
fi fi
REAL_DAEMON=sogod-0.9 REAL_DAEMON=sogod
DAEMON=/usr/sbin/sogod DAEMON=/usr/sbin/sogod
NAME=sogo NAME=sogo
DESC="Scalable OpenGroupware.Org (Inverse edition)" DESC="Scalable OpenGroupware.Org (Inverse edition)"

View File

@ -40,22 +40,22 @@ else
fi fi
fi fi
if [ -x $GNUSTEP_USER_ROOT/Tools/sogod-0.9 ]; then if [ -x $GNUSTEP_USER_ROOT/Tools/sogod ]; then
sogod="$GNUSTEP_USER_ROOT/Tools/sogod-0.9" sogod="$GNUSTEP_USER_ROOT/Tools/sogod"
elif [ -x $GNUSTEP_LOCAL_ROOT/Tools/sogod-0.9 ]; then elif [ -x $GNUSTEP_LOCAL_ROOT/Tools/sogod ]; then
sogod="$GNUSTEP_LOCAL_ROOT/Tools/sogod-0.9" sogod="$GNUSTEP_LOCAL_ROOT/Tools/sogod"
elif [ -x $GNUSTEP_LOCAL_ROOT/Tools/Admin/sogod-0.9 ]; then elif [ -x $GNUSTEP_LOCAL_ROOT/Tools/Admin/sogod ]; then
sogod="$GNUSTEP_LOCAL_ROOT/Tools/Admin/sogod-0.9" sogod="$GNUSTEP_LOCAL_ROOT/Tools/Admin/sogod"
elif [ -x $GNUSTEP_SYSTEM_ROOT/Tools/sogod-0.9 ]; then elif [ -x $GNUSTEP_SYSTEM_ROOT/Tools/sogod ]; then
sogod="$GNUSTEP_SYSTEM_ROOT/Tools/sogod-0.9" sogod="$GNUSTEP_SYSTEM_ROOT/Tools/sogod"
elif [ -x $GNUSTEP_SYSTEM_ROOT/Tools/Admin/sogod-0.9 ]; then elif [ -x $GNUSTEP_SYSTEM_ROOT/Tools/Admin/sogod ]; then
sogod="$GNUSTEP_SYSTEM_ROOT/Tools/Admin/sogod-0.9" sogod="$GNUSTEP_SYSTEM_ROOT/Tools/Admin/sogod"
else else
echo "Can't find sogod-0.9" echo "Can't find sogod"
exit 1 exit 1
fi fi
startport=`defaults read sogod-0.9 WOPort` startport=`defaults read sogod WOPort`
if [ "$?" == "0" ] if [ "$?" == "0" ]
then then
startport=`echo $startport | awk '{print $3}'` startport=`echo $startport | awk '{print $3}'`
@ -74,4 +74,3 @@ echo "SOGOD: $sogod" 2>&1
exec $sogod -WOPort $port >> /var/log/sogo/sogod-$port.log 2>&1 & exec $sogod -WOPort $port >> /var/log/sogo/sogod-$port.log 2>&1 &
echo $! > $PIDFILE echo $! > $PIDFILE

View File

@ -155,17 +155,17 @@ rm -fr ${RPM_BUILD_ROOT}
/var/run/sogo /var/run/sogo
/var/log/sogo /var/log/sogo
/var/spool/sogo /var/spool/sogo
%{prefix}/Tools/Admin/sogod-0.9 %{prefix}/Tools/Admin/sogod
%{prefix}/Library/Libraries/libSOGo.so.* %{prefix}/Library/Libraries/libSOGo.so.*
%{prefix}/Library/Libraries/libSOGoUI.so.* %{prefix}/Library/Libraries/libSOGoUI.so.*
%{prefix}/Library/Libraries/libOGoContentStore.so* %{prefix}/Library/Libraries/libOGoContentStore.so*
%{prefix}/Library/SOGo-0.9/*.SOGo %{prefix}/Library/SOGo/*.SOGo
%{prefix}/Library/SOGo-0.9/SOGo.framework/Resources %{prefix}/Library/SOGo/SOGo.framework/Resources
%{prefix}/Library/SOGo-0.9/SOGo.framework/Versions/0/libSOGo.so.* %{prefix}/Library/SOGo/SOGo.framework/Versions/0/libSOGo.so.*
%{prefix}/Library/SOGo-0.9/SOGo.framework/Versions/0/Resources %{prefix}/Library/SOGo/SOGo.framework/Versions/0/Resources
%{prefix}/Library/SOGo-0.9/SOGo.framework/Versions/Current %{prefix}/Library/SOGo/SOGo.framework/Versions/Current
%{prefix}/Library/SOGo-0.9/Templates %{prefix}/Library/SOGo/Templates
%{prefix}/Library/SOGo-0.9/WebServerResources %{prefix}/Library/SOGo/WebServerResources
%{prefix}/Library/OCSTypeModels/appointment.ocs %{prefix}/Library/OCSTypeModels/appointment.ocs
%{prefix}/Library/OCSTypeModels/contact.ocs %{prefix}/Library/OCSTypeModels/contact.ocs
%{prefix}/Library/OCSTypeModels/appointment-oracle.ocs %{prefix}/Library/OCSTypeModels/appointment-oracle.ocs
@ -180,12 +180,12 @@ rm -fr ${RPM_BUILD_ROOT}
%{prefix}/Library/Headers/SOGoUI %{prefix}/Library/Headers/SOGoUI
%{prefix}/Library/Libraries/libSOGo.so %{prefix}/Library/Libraries/libSOGo.so
%{prefix}/Library/Libraries/libSOGoUI.so %{prefix}/Library/Libraries/libSOGoUI.so
%{prefix}/Library/SOGo-0.9/SOGo.framework/Headers %{prefix}/Library/SOGo/SOGo.framework/Headers
%{prefix}/Library/SOGo-0.9/SOGo.framework/libSOGo.so %{prefix}/Library/SOGo/SOGo.framework/libSOGo.so
%{prefix}/Library/SOGo-0.9/SOGo.framework/SOGo %{prefix}/Library/SOGo/SOGo.framework/SOGo
%{prefix}/Library/SOGo-0.9/SOGo.framework/Versions/0/Headers %{prefix}/Library/SOGo/SOGo.framework/Versions/0/Headers
%{prefix}/Library/SOGo-0.9/SOGo.framework/Versions/0/libSOGo.so %{prefix}/Library/SOGo/SOGo.framework/Versions/0/libSOGo.so
%{prefix}/Library/SOGo-0.9/SOGo.framework/Versions/0/SOGo %{prefix}/Library/SOGo/SOGo.framework/Versions/0/SOGo
%files -n sope%{sope_major_version}%{sope_minor_version}-gdl1-contentstore %files -n sope%{sope_major_version}%{sope_minor_version}-gdl1-contentstore
%defattr(-,root,root,-) %defattr(-,root,root,-)