X-Git-Url: http://git.onelab.eu/?p=plcrt.git;a=blobdiff_plain;f=plcrt.spec;h=a182f9081d66584d555662a2404c8d26b1843cac;hp=b67565da13f034a00b90a95f9fe0a49b0cc3db15;hb=98f75cf5f1846cb14af601ce32b8b6f5fa31a181;hpb=01a0036064141b1031fe3d06162eec10d81aa135

diff --git a/plcrt.spec b/plcrt.spec
index b67565d..a182f90 100644
--- a/plcrt.spec
+++ b/plcrt.spec
@@ -6,7 +6,7 @@
 
 %define name plcrt
 %define version 1.0
-%define taglevel 5
+%define taglevel 9
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -41,19 +41,43 @@ or PlanetLab in particular.
 
 %install
 
+function install_file()
+{
+    mod=$1
+    dest=$2
+    file=$3
+    if [ -z "$file" ] ; then 
+        file=$( basename $dest )
+    fi
+    if [ -f $file ] ; then
+        install -D -m $mod $file $dest
+    fi
+}
+function chmod_pattern()
+{
+    mod=$1
+    pattern=$2
+    for file in $pattern ; do 
+        if [ -f $file ] ; then
+            chmod $mod $file
+        fi
+    done
+}
+
 install -d $RPM_BUILD_ROOT/%{_datadir}/%{name}
-install -D -m 755 plcrt.init $RPM_BUILD_ROOT/%{_sysconfdir}/plc.d/plcrt
+install_file 755 $RPM_BUILD_ROOT/%{_sysconfdir}/plc.d/plcrt plcrt.init
 
 echo " * Installing core scripts"
 rsync -a ./ $RPM_BUILD_ROOT/%{_datadir}/%{name}/
 
-install -D -m 644 rt.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/rt.cron
-install -D -m 755 getpersons.py $RPM_BUILD_ROOT/%{_datadir}/%{name}/getpersons.py
-install -D -m 755 callplcsh.py $RPM_BUILD_ROOT/%{_datadir}/%{name}/callplcsh.py
-install -D -m 755 adduserstort.pl $RPM_BUILD_ROOT/%{_datadir}/%{name}/adduserstort.pl
+install_file 644 $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/rt.cron
+install_file 755 $RPM_BUILD_ROOT/%{_datadir}/%{name}/getpersons.py
+install_file 755 $RPM_BUILD_ROOT/%{_datadir}/%{name}/adduserstort.pl
 
 echo " * Installing cron scripts"
-chmod 755 $RPM_BUILD_ROOT/%{_datadir}/%{name}/cron.d/*.sh
+chmod_pattern 755 $RPM_BUILD_ROOT/%{_datadir}/%{name}/cron.d/*.py 
+chmod_pattern 755 $RPM_BUILD_ROOT/%{_datadir}/%{name}/cron.d/*.sh
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -84,15 +108,15 @@ plc-config --category plc_rt --variable enabled --value true \
 
 # NOTE: setup default values until myplc includes them by default.
 plc-config --category plc_rt --variable host --value localhost.localdomain \
-	--save /etc/planetlab/configs/site.xml /etc/planetlab/configs/site.xml 
+    --save /etc/planetlab/configs/site.xml /etc/planetlab/configs/site.xml 
 plc-config --category plc_rt --variable ip --value "" \
-	--save /etc/planetlab/configs/site.xml /etc/planetlab/configs/site.xml 
+    --save /etc/planetlab/configs/site.xml /etc/planetlab/configs/site.xml 
 plc-config --category plc_rt --variable web_user --value root \
-	--save /etc/planetlab/configs/site.xml /etc/planetlab/configs/site.xml 
+    --save /etc/planetlab/configs/site.xml /etc/planetlab/configs/site.xml 
 plc-config --category plc_rt --variable web_password --value password \
-	--save /etc/planetlab/configs/site.xml /etc/planetlab/configs/site.xml 
+    --save /etc/planetlab/configs/site.xml /etc/planetlab/configs/site.xml 
 plc-config --category plc_rt --variable dbpassword --value "" \
-	--save /etc/planetlab/configs/site.xml /etc/planetlab/configs/site.xml 
+    --save /etc/planetlab/configs/site.xml /etc/planetlab/configs/site.xml 
 
 # NOTE: not sure why these aren't setup by the rt package...
 mkdir -p /var/log/rt3
@@ -102,6 +126,21 @@ chown apache.apache /var/log/rt3/rt.log
 cp /usr/share/rt3/html/NoAuth/images/bplogo.gif /var/www/html/misc/logo.gif
 
 %changelog
+* Mon Sep 21 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - PLCRT-1.0-9
+- be more selective about which files to chmod
+
+* Mon Sep 21 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - PLCRT-1.0-8
+- shorter polling period for faster sync
+- remove attempt to install removed file
+
+* Sun Sep 20 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - PLCRT-1.0-7
+- replace callplcsh with simpler scripts for syncing users
+
+* Sat Sep 19 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - PLCRT-1.0-6
+- some plcs don't return site_ids so getpersons should not depend on this field
+- make scripts exec on install
+- use RT_HOST name rather than localhost for RT mailgate configuration
+
 * Wed Jul 08 2009 Stephen Soltesz <soltesz@cs.princeton.edu> - PLCRT-1.0-5
 - add mailing list watchers to default queues
 - add script to addwatchers to default queues