Merge branch 'dev-arcconf-reconf-new-parser' into 'master'

Dev arcconf reconf new parser

See merge request nordugrid/arc!257

configure.ac

@@ -2357,9 +2357,9 @@ AC_CONFIG_FILES([Makefile
                  src/libs/data-staging/examples/Makefile
                  src/services/Makefile
                  src/services/a-rex/Makefile
-                 src/services/a-rex/a-rex
-                 src/services/a-rex/a-rex.service
-                 src/services/a-rex/a-rex-start
+                 src/services/a-rex/arc-arex
+                 src/services/a-rex/arc-arex.service
+                 src/services/a-rex/arc-arex-start
                  src/services/a-rex/a-rex-backtrace-collect
                  src/services/a-rex/a-rex-backtrace-collect.8
                  src/services/a-rex/perferator
@@ -2425,13 +2425,6 @@ AC_CONFIG_FILES([Makefile
                  src/services/a-rex/lrms/slurm/test/Makefile
                  src/services/a-rex/lrms/slurm/test/scan/Makefile
                  src/services/a-rex/lrms/slurm/test/submit/Makefile
-                 src/services/a-rex/lrms/dgbridge/Makefile
-                 src/services/a-rex/lrms/dgbridge/DGAuthplug.py
-                 src/services/a-rex/lrms/dgbridge/DGBridgeDataPlugin.py
-                 src/services/a-rex/lrms/dgbridge/DGLog2XML.py
-                 src/services/a-rex/lrms/dgbridge/submit-DGBridge-job
-                 src/services/a-rex/lrms/dgbridge/scan-DGBridge-job
-                 src/services/a-rex/lrms/dgbridge/cancel-DGBridge-job
                  src/services/a-rex/lrms/boinc/Makefile
                  src/services/a-rex/lrms/boinc/submit-boinc-job
                  src/services/a-rex/lrms/boinc/scan-boinc-job
@@ -2448,29 +2441,26 @@ AC_CONFIG_FILES([Makefile
                  src/services/a-rex/schema/Makefile
                  src/services/acix/Makefile
                  src/services/acix/cacheserver/Makefile
-                 src/services/acix/cacheserver/acix-cache
-                 src/services/acix/cacheserver/acix-cache-start
-                 src/services/acix/cacheserver/acix-cache.service
+                 src/services/acix/cacheserver/arc-acix-scanner
+                 src/services/acix/cacheserver/arc-acix-scanner-start
+                 src/services/acix/cacheserver/arc-acix-scanner.service
                  src/services/acix/cacheserver/test/Makefile
                  src/services/acix/core/Makefile
                  src/services/acix/core/test/Makefile
                  src/services/acix/indexserver/Makefile
-                 src/services/acix/indexserver/acix-index
-                 src/services/acix/indexserver/acix-index-start
-                 src/services/acix/indexserver/acix-index.service
+                 src/services/acix/indexserver/arc-acix-index
+                 src/services/acix/indexserver/arc-acix-index-start
+                 src/services/acix/indexserver/arc-acix-index.service
                  src/services/acix/indexserver/test/Makefile
                  src/services/candypond/Makefile
-                 src/services/candypond/arc-candypond
-                 src/services/candypond/arc-candypond.service
-                 src/services/candypond/arc-candypond-start
                  src/services/data-staging/Makefile
                  src/services/data-staging/arc-datadelivery-service
                  src/services/data-staging/arc-datadelivery-service.service
                  src/services/data-staging/arc-datadelivery-service-start
                  src/services/gridftpd/Makefile
-                 src/services/gridftpd/gridftpd.init
-                 src/services/gridftpd/gridftpd.service
-                 src/services/gridftpd/gridftpd-start
+                 src/services/gridftpd/arc-gridftpd
+                 src/services/gridftpd/arc-gridftpd.service
+                 src/services/gridftpd/arc-gridftpd-start
                  src/services/gridftpd/gridftpd.8
                  src/services/gridftpd/auth/Makefile
                  src/services/gridftpd/conf/Makefile
@@ -2480,7 +2470,7 @@ AC_CONFIG_FILES([Makefile
                  src/services/ldap-infosys/Makefile
                  src/services/ldap-infosys/create-bdii-config
                  src/services/ldap-infosys/create-slapd-config
-                 src/services/ldap-infosys/nordugrid-arc-aris
+                 src/services/ldap-infosys/arc-infosys-ldap
                  src/services/monitor/Makefile
                  src/services/monitor/monitor
                  src/services/monitor/README
@@ -2542,9 +2532,9 @@ AC_CONFIG_FILES([Makefile
                  src/utils/python/arcctl
                  src/utils/python/arcctl.1
                  src/utils/python/arc/Makefile
+                 src/utils/python/arc/paths.py
                  src/utils/python/arc/utils/Makefile
                  src/utils/python/arc/control/Makefile
-                 src/utils/python/arc/control/ControlPaths.py
                  src/utils/hed/wsdl2hed.1
                  src/utils/hed/arcplugin.1
                  src/utils/hed/Makefile

debian/control

@@ -79,22 +79,6 @@ Description: ARC GridFTP server
    fileplugin : Standard GridFTP server based on Globus globus-ftp-control
    jobsplugin : Classical ARC job submission interface
 
-Package: nordugrid-arc-candypond
-Provides: nordugrid-arc-cache-service
-Replaces: nordugrid-arc-cache-service (<< 6.0.0~)
-Conflicts: nordugrid-arc-cache-service (<< 6.0.0~)
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libarccommon3 (= ${binary:Version}), nordugrid-arc-hed (= ${binary:Version}), nordugrid-arc-plugins-needed (= ${binary:Version}), lsb-base (>= 3.0-6)
-Description: ARC CandyPond service
- NorduGrid is a collaboration aiming at development, maintenance and
- support of the free Grid middleware, known as the Advanced Resource
- Connector (ARC).
- .
- This package contains the ARC CandyPond service. It provides a way to perform
- some operations on the ARC Compute Element cache remotely. It can be
- especially helpful for data-driven job scheduling within pilot job
- frameworks.
-
 Package: nordugrid-arc-datadelivery-service
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libarccommon3 (= ${binary:Version}), nordugrid-arc-hed (= ${binary:Version}), nordugrid-arc-plugins-needed (= ${binary:Version}), lsb-base (>= 3.0-6)
@@ -105,10 +89,10 @@ Description: ARC data delivery service
  .
  This package contains the ARC data delivery service.
 
-Package: nordugrid-arc-aris
-Provides: nordugrid-arc-ldap-infosys
-Replaces: nordugrid-arc-ldap-infosys (<< 6.0.0~), nordugrid-arc-ldap-egiis (<< 6.0.0~)
-Conflicts: nordugrid-arc-ldap-infosys (<< 6.0.0~), nordugrid-arc-ldap-egiis (<< 6.0.0~)
+Package: nordugrid-arc-infosys-ldap
+Provides: nordugrid-arc-ldap-infosys, nordugrid-arc-aris
+Replaces: nordugrid-arc-ldap-infosys (<< 6.0.0~), nordugrid-arc-aris (<< 6.0.0~), nordugrid-arc-ldap-egiis (<< 6.0.0~)
+Conflicts: nordugrid-arc-ldap-infosys (<< 6.0.0~), nordugrid-arc-aris (<< 6.0.0~), nordugrid-arc-ldap-egiis (<< 6.0.0~)
 Architecture: all
 Depends: ${misc:Depends}, ${perl:Depends}, slapd, bdii, lsb-base (>= 3.0-6)
 Description: ARC local information system
@@ -132,10 +116,13 @@ Description: ARC LDAP monitor service
  .
  This package contains the LDAP monitor system for ARC.
  This package is self-contained. It is used to set up a Web-based monitor
- which pulls information from ARIS and displays it in a readable
- manner.
+ which pulls information from the information system and displays it in a
+ readable manner.
 
 Package: nordugrid-arc-arex
+Provides: nordugrid-arc-cache-service, nordugrid-arc-candypond
+Replaces: nordugrid-arc-cache-service (<< 6.0.0~), nordugrid-arc-candypond (<< 6.0.0~)
+Conflicts: nordugrid-arc-cache-service (<< 6.0.0~), nordugrid-arc-candypond (<< 6.0.0~)
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, libarccommon3 (= ${binary:Version}), nordugrid-arc-hed (= ${binary:Version}), nordugrid-arc-plugins-needed (= ${binary:Version}), nordugrid-arc-python (= ${binary:Version}), libjson-xs-perl, libxml-simple-perl, python, python-stompy, python-ldap, python-isodate, lsb-base (>= 3.0-6)
 Description: ARC Remote EXecution service
@@ -184,16 +171,19 @@ Description: ARC cache index - core components
  .
  Core components of the ARC Cache Index (ACIX).
 
-Package: nordugrid-arc-acix-cache
+Package: nordugrid-arc-acix-scanner
+Provides: nordugrid-arc-acix-cache
+Replaces: nordugrid-arc-acix-cache (<< 6.0.0~)
+Conflicts: nordugrid-arc-acix-cache (<< 6.0.0~)
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}, nordugrid-arc-acix-core (= ${binary:Version}), lsb-base (>= 3.0-6)
 XB-Python-Version: ${python:Versions}
-Description: ARC cache index - cache server
+Description: ARC cache index - scanner server
  NorduGrid is a collaboration aiming at development, maintenance and
  support of the free Grid middleware, known as the Advanced Resource
  Connector (ARC).
  .
- Cache server component of the ARC Cache Index (ACIX), usually installed
+ Cache scanner component of the ARC Cache Index (ACIX), usually installed
  alongside A-REX. This component collects information on the content of
  an A-REX cache.
 
@@ -234,23 +224,28 @@ Description: ARC Python wrapper
  .
  Python bindings for ARC.
 
-Package: nordugrid-arc-gridmap-utils
+Package: nordugrid-arc-nordugridmap
+Provides: nordugrid-arc-gridmap-utils
+Replaces: nordugrid-arc-gridmap-utils (<< 6.0.0~)
+Conflicts: nordugrid-arc-gridmap-utils (<< 6.0.0~)
 Architecture: all
 Depends: libnet-ldap-perl, libxml-dom-perl, libcrypt-ssleay-perl, libsoap-lite-perl, libcrypt-openssl-x509-perl, ${perl:Depends}, ${misc:Depends}
 Recommends: cron
-Description: NorduGrid authorization tools
+Description: The nordugridmap authorization tool
  NorduGrid is a collaboration aiming at development, maintenance and
  support of the free Grid middleware, known as the Advanced Resource
  Connector (ARC).
  .
- This package contains the ARC authorization machinery.
  A prominent tool distributed in this package is the nordugridmap
  script to map Grid user identities to local Linux accounts.
 
-Package: nordugrid-arc-misc-utils
+Package: nordugrid-arc-test-utils
+Provides: nordugrid-arc-misc-utils
+Replaces: nordugrid-arc-misc-utils (<< 6.0.0~)
+Conflicts: nordugrid-arc-misc-utils (<< 6.0.0~)
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libarccommon3 (= ${binary:Version})
-Description: ARC grid middleware - Misc tools
+Description: ARC test tools
  NorduGrid is a collaboration aiming at development, maintenance and
  support of the free Grid middleware, known as the Advanced Resource
  Connector (ARC).

debian/libarccommon3.install

@@ -23,18 +23,24 @@ debian/tmp/usr/lib/arc/arc-hostname-resolver
 debian/tmp/usr/lib/arc/DataStagingDelivery
 debian/tmp/usr/lib/arc/arcconfig-parser
 debian/tmp/usr/lib/python?.?/site-packages/arc/__init__.py*
+debian/tmp/usr/lib/python?.?/site-packages/arc/paths.py*
 debian/tmp/usr/lib/python?.?/site-packages/arc/utils/__init__.py*
 debian/tmp/usr/lib/python?.?/site-packages/arc/utils/config.py*
+debian/tmp/usr/lib/python?.?/site-packages/arc/utils/reference.py*
 debian/tmp/usr/lib/python?.?/site-packages/arc/control/__init__.py*
 debian/tmp/usr/lib/python?.?/site-packages/arc/control/Accounting.py*
+debian/tmp/usr/lib/python?.?/site-packages/arc/control/CertificateGenerator.py*
+debian/tmp/usr/lib/python?.?/site-packages/arc/control/Config.py*
 debian/tmp/usr/lib/python?.?/site-packages/arc/control/ControlCommon.py*
-debian/tmp/usr/lib/python?.?/site-packages/arc/control/ControlPaths.py*
 debian/tmp/usr/lib/python?.?/site-packages/arc/control/Jobs.py*
 debian/tmp/usr/lib/python?.?/site-packages/arc/control/OSPackage.py*
 debian/tmp/usr/lib/python?.?/site-packages/arc/control/OSService.py*
 debian/tmp/usr/lib/python?.?/site-packages/arc/control/RunTimeEnvironment.py*
 debian/tmp/usr/lib/python?.?/site-packages/arc/control/Services.py*
+debian/tmp/usr/lib/python?.?/site-packages/arc/control/TestCA.py*
 debian/tmp/usr/lib/python?.?/site-packages/arc/control/ThirdPartyDeployment.py*
+
+debian/tmp/usr/share/arc/arc.parser.defaults
 debian/tmp/usr/share/arc/examples/arc.conf.reference
 debian/tmp/usr/share/arc/schema
 debian/tmp/usr/share/locale/*/LC_MESSAGES/nordugrid-arc.mo

debian/nordugrid-arc-candypond.arc-candypond.default → debian/nordugrid-arc-acix-index.arc-acix-index.default

-# To enable arc-candypond, i.e. to indicate that a readily usable
+# To enable arc-acix-index, i.e. to indicate that a readily usable
 # configuration is in place, comment out or delete the
 # following line.
 RUN=no

debian/nordugrid-arc-acix-index.acix-index.default → debian/nordugrid-arc-acix-scanner.arc-acix-scanner.default

-# To enable acix-index, i.e. to indicate that a readily usable
+# To enable arc-acix-scanner, i.e. to indicate that a readily usable
 # configuration is in place, comment out or delete the
 # following line.
 RUN=no

debian/nordugrid-arc-gridftpd.gridftpd.default → debian/nordugrid-arc-arex.arc-arex.default

-# To enable gridftpd, i.e. to indicate that a readily usable
+# To enable arc-arex, i.e. to indicate that a readily usable
 # configuration is in place, comment out or delete the
 # following line.
 RUN=no

debian/nordugrid-arc-arex.install.in

@@ -9,10 +9,6 @@ debian/tmp/usr/lib/arc/smtp-send
 debian/tmp/usr/lib/arc/smtp-send.sh
 debian/tmp/usr/lib/arc/ssmsend
 
-debian/tmp/usr/share/arc/DGAuthplug.py*
-debian/tmp/usr/share/arc/DGBridgeDataPlugin.py*
-debian/tmp/usr/share/arc/DGLog2XML.py*
-
 debian/tmp/usr/share/arc/cancel-*-job
 debian/tmp/usr/share/arc/scan-*-job
 debian/tmp/usr/share/arc/submit-*-job
@@ -20,6 +16,8 @@ debian/tmp/usr/share/arc/perferator
 
 debian/tmp/usr/lib/arc/libarex.so
 debian/tmp/usr/lib/arc/libarex.apd
+debian/tmp/usr/lib/arc/libcandypond.so
+debian/tmp/usr/lib/arc/libcandypond.apd
 
 debian/tmp/usr/share/arc/CEinfo.pl
 debian/tmp/usr/share/arc/ARC0mod.pm
@@ -33,7 +31,6 @@ debian/tmp/usr/share/arc/PBS.pm
 debian/tmp/usr/share/arc/Condor.pm
 debian/tmp/usr/share/arc/SLURMmod.pm
 debian/tmp/usr/share/arc/SLURM.pm
-debian/tmp/usr/share/arc/DGBridge.pm
 debian/tmp/usr/share/arc/Boinc.pm
 
 debian/tmp/usr/share/arc/XmlPrinter.pm
@@ -76,6 +73,7 @@ debian/tmp/usr/share/arc/ssm/ssm2.py*
 debian/tmp/usr/share/arc/ssm/brokers.py*
 debian/tmp/usr/share/arc/ssm/sender.cfg
 
+debian/tmp/usr/share/arc/rte/ENV/LRMS-SCRATCH
 debian/tmp/usr/share/arc/rte/ENV/PROXY
 debian/tmp/usr/share/arc/rte/ENV/RTE
 

debian/nordugrid-arc-arex.logrotate

-/var/log/arc/arex.log {
+#
+# Logs written by A-REX
+#
+/var/log/arc/arex.log
+/var/log/arc/arex-jobs.log
+/var/log/arc/job.helper.errors
+/var/log/arc/ws-interface.log
+/var/log/arc/datastaging.log
+{
   missingok
   compress
   delaycompress
   daily
   rotate 14
   create
+  sharedscripts
   postrotate
-	kill -HUP `cat /var/run/arched-arex.pid 2> /dev/null` 2> /dev/null || true
+	kill -HUP `cat /var/run/arc/arex.pid 2> /dev/null` 2> /dev/null || true
   endscript
 }
 
-/var/log/arc/ws-interface.log {
+#
+# External processes spawned by A-REX
+#
+/var/log/arc/infoprovider.log
+/var/log/arc/cache-cleaner.log
+/var/log/arc/jura.log
+{
   missingok
   compress
   delaycompress
   daily
   rotate 14
-  postrotate
-    kill -HUP `cat /var/run/arched-arex.pid 2> /dev/null` 2> /dev/null || true
-  endscript
   create
 }
 
-/var/log/arc/cache-clean.log {
-  missingok
-  compress
-  delaycompress
-  daily
-  rotate 14
-  create
-}
 
-/var/log/arc/accounting-jura.log {
+#
+# Extra services coupled with A-REX
+#
+/var/log/arc/arc-acix-scanner.log
+/var/log/arc/nordugridmap.log
+{
   missingok
   compress
   delaycompress
@@ -40,15 +49,11 @@
   create
 }
 
-/var/log/arc/perfdata/arex.perflog {
-  missingok
-  compress
-  daily
-  rotate 14
-  create
-}
-
-/var/log/arc/perfdata/data.perflog {
+#
+# Developer-enabled performance logging
+#
+/var/log/arc/perfdata/*.perflog 
+{
   missingok
   compress
   daily
@@ -56,34 +61,3 @@
   create
 }
 
-/var/log/arc/perfdata/system.perflog {
-  missingok
-  compress
-  daily
-  rotate 14
-  create
-}
-
-/var/log/arc/perfdata/backends.perflog {
-  missingok
-  compress
-  daily
-  rotate 14
-  create
-}
-
-/var/log/arc/perfdata/sysinfo.perflog {
-  missingok
-  compress
-  daily
-  rotate 14
-  create
-}
-
-/var/log/arc/perfdata/submission.perflog {
-  missingok
-  compress
-  daily
-  rotate 14
-  create
-}

debian/nordugrid-arc-arex.postinst

+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ] ; then
+   # check hostcert is already generated (update vs install)
+   if [ ! -f /etc/grid-security/testCA-hostcert.pem ] ; then
+       arcctl test-ca init
+       arcctl test-ca hostcert
+   fi
+fi
+
+#DEBHELPER#

debian/nordugrid-arc-aris.logrotate

-/var/log/arc/infoprovider.log {
-  missingok
-  compress
-  delaycompress
-  daily
-  rotate 14
-  create
-}
-/var/log/arc/inforegistration.log {
-  missingok
-  compress
-  delaycompress
-  daily
-  rotate 14
-  create
-}
-/var/log/arc/bdii/bdii-update.log {
-  missingok
-  compress
-  daily
-  rotate 30
-  copytruncate	
-}
-/var/log/arc/perfdata/infosys.perflog {
-  missingok
-  compress
-  daily
-  rotate 14
-  create
-}
-

debian/nordugrid-arc-aris.nordugrid-arc-aris.default

-# To enable nordugrid-arc-bdii, i.e. to indicate that a readily usable
-# configuration is in place, comment out or delete the
-# following line.
-RUN=no

debian/nordugrid-arc-candypond.install

-debian/tmp/usr/lib/arc/libcandypond.so
-debian/tmp/usr/lib/arc/libcandypond.apd

debian/nordugrid-arc-datadelivery-service.logrotate

-/var/log/arc/datadelivery-service.log {
+/var/log/arc/datadelivery-service.log
+{
   missingok
   compress
   delaycompress
@@ -6,6 +7,6 @@
   rotate 14
   create
   postrotate
-  kill -HUP `cat /var/run/arched-datadelivery-service.pid 2> /dev/null` 2> /dev/null || true
+  kill -HUP `cat /var/run/arc/datadelivery-service.pid 2> /dev/null` 2> /dev/null || true
   endscript
 }

debian/nordugrid-arc-acix-cache.acix-cache.default → debian/nordugrid-arc-gridftpd.arc-gridftpd.default

-# To enable acix-cache, i.e. to indicate that a readily usable
+# To enable arc-gridftpd, i.e. to indicate that a readily usable
 # configuration is in place, comment out or delete the
 # following line.
 RUN=no

debian/nordugrid-arc-arex.a-rex.default → debian/nordugrid-arc-infosys-ldap.arc-infosys-ldap.default

-# To enable a-rex, i.e. to indicate that a readily usable
+# To enable arc-infosys-ldap, i.e. to indicate that a readily usable
 # configuration is in place, comment out or delete the
 # following line.
 RUN=no

debian/nordugrid-arc-infosys-ldap.logrotate

+/var/log/arc/bdii/bdii-update.log
+{
+  missingok
+  compress
+  daily
+  rotate 14
+  copytruncate
+}
+

debian/rules

@@ -71,14 +71,13 @@ clean:
 	if [ -r Makefile ] ; then $(MAKE) distclean ; fi
 
 	rm -f debian/nordugrid-arc-arex.install
-	rm -f debian/nordugrid-arc-arex.a-rex.init
+	rm -f debian/nordugrid-arc-arex.arc-arex.init
 	rm -f debian/nordugrid-arc-hed.arched.init
-	rm -f debian/nordugrid-arc-candypond.arc-candypond.init
 	rm -f debian/nordugrid-arc-datadelivery-service.arc-datadelivery-service.init
-	rm -f debian/nordugrid-arc-gridftpd.gridftpd.init
-	rm -f debian/nordugrid-arc-aris.nordugrid-arc-aris.init
-	rm -f debian/nordugrid-arc-acix-cache.acix-cache.init
-	rm -f debian/nordugrid-arc-acix-index.acix-index.init
+	rm -f debian/nordugrid-arc-gridftpd.arc-gridftpd.init
+	rm -f debian/nordugrid-arc-infosys-ldap.arc-infosys-ldap.init
+	rm -f debian/nordugrid-arc-acix-scanner.arc-acix-scanner.init
+	rm -f debian/nordugrid-arc-acix-index.arc-acix-index.init
 
 	if [ -f po/POTFILES.in.save ] ; then \
 	    mv po/POTFILES.in.save po/POTFILES.in ; \
@@ -104,22 +103,20 @@ install: build-stamp
 
 	rm -f $(CURDIR)/debian/tmp/usr/lib/libarcglobusutils.so
 
-	mv debian/tmp/etc/init.d/a-rex \
-	   debian/nordugrid-arc-arex.a-rex.init
+	mv debian/tmp/etc/init.d/arc-arex \
+	   debian/nordugrid-arc-arex.arc-arex.init
 	mv debian/tmp/etc/init.d/arched \
 	   debian/nordugrid-arc-hed.arched.init
-	mv debian/tmp/etc/init.d/arc-candypond \
-	   debian/nordugrid-arc-candypond.arc-candypond.init
 	mv debian/tmp/etc/init.d/arc-datadelivery-service \
 	   debian/nordugrid-arc-datadelivery-service.arc-datadelivery-service.init
-	mv debian/tmp/etc/init.d/gridftpd \
-	   debian/nordugrid-arc-gridftpd.gridftpd.init
-	mv debian/tmp/etc/init.d/nordugrid-arc-aris \
-	   debian/nordugrid-arc-aris.nordugrid-arc-aris.init
-	mv debian/tmp/etc/init.d/acix-cache \
-	   debian/nordugrid-arc-acix-cache.acix-cache.init