idok-commit AT lists.psi.ch
Subject: Commit emails of the iDok project
List archive
- From: "AFS account Florian Huebner" <huebner AT savannah.psi.ch>
- To: idok-commit AT lists.psi.ch
- Subject: [idok-commit] idok commit r198 - trunk/sites/psi
- Date: Fri, 29 Aug 2008 16:38:44 +0200
- List-archive: <https://lists.web.psi.ch/pipermail/idok-commit/>
- List-id: Commit emails of the iDok project <idok-commit.lists.psi.ch>
Author: huebner
Date: Fri Aug 29 16:38:44 2008
New Revision: 198
Log:
added the dmsd nagios check script and the pydok upload script to the install
target
Modified:
trunk/sites/psi/build.xml
Modified: trunk/sites/psi/build.xml
==============================================================================
--- trunk/sites/psi/build.xml (original)
+++ trunk/sites/psi/build.xml Fri Aug 29 16:38:44 2008
@@ -13,6 +13,8 @@
description="base directory for hosting the www.idok.ch web
site" />
<property name="install.dir"
value="/afs/psi.ch/project/dms/admin/devel/opt/dms" />
+ <property name="pydok_install.dir"
+ value="${install.dir}/cgi-bin" />
<property name="dmsd_install.dir"
value="/afs/psi.ch/project/dms/admin/devel/opt/dmsd" />
<property name="deploy_qa.path"
@@ -124,6 +126,10 @@
<arg value="-c" />
<arg value="cp --preserve=mode mailer.py
${install.dir}" />
</exec>
+ <exec dir="${psi-idok.basedir}/scripts/admin" executable="sh">
+ <arg value="-c" />
+ <arg value="cp --preserve=mode
nagios_check_dmsd_status ${install.dir}" />
+ </exec>
<!-- Copy jars if newer than destination -->
<copy todir="${install.dir}" flatten="true">
@@ -142,6 +148,8 @@
</copy>
<copy file="${psi-idok.basedir}/scripts/admin/logging.conf"
todir="${install.dir}"/>
+ <antcall target="copy-pydok">
+ </antcall>
<antcall target="sign-all-jars">
</antcall>
</target>
@@ -196,9 +204,10 @@
<target name="copy-pydok" description="">
<!-- Copy the pydok script to the cgi-bin directory -->
- <copy file="${idok.basedir}/python/pydok/test/idok_upload_cgi.py"
todir="${install.dir}/cgi-bin/"/>
+ <mkdir dir="${pydok_install.dir}" />
+ <copy file="${idok.basedir}/python/pydok/test/idok_upload_cgi.py"
todir="${pydok_install.dir}"/>
<chmod perm="u+x" verbose="yes">
- <fileset dir="${install.dir}/cgi-bin/"
casesensitive="yes">
+ <fileset dir="${pydok_install.dir}"
casesensitive="yes">
<include name="*.py"/>
</fileset>
</chmod>
- [idok-commit] idok commit r198 - trunk/sites/psi, AFS account Florian Huebner, 08/29/2008
Archive powered by MHonArc 2.6.19.