Commit d9753cc1 authored by Aleksandr Konstantinov's avatar Aleksandr Konstantinov

Merge branch 'master' into job_resume_better_message

parents b7b8cb6d 2e9d084b
......@@ -13,7 +13,7 @@ fork_packages_el6:
stage: build
image: maikenp/arc-build-centos6
script:
- echo "$(date +%Y%m%dT%H%M%S)_${CI_COMMIT_SHA:0:8}_master" > VERSION
- echo "$(date +%Y%m%d%H%M%S)" > VERSION
- yum update -y
- ./autogen.sh
- ./configure
......@@ -47,7 +47,7 @@ fork_packages_el7:
stage: build
image: maikenp/arc-build-centos7
script:
- echo "$(date +%Y%m%dT%H%M%S)_${CI_COMMIT_SHA:0:8}_master" > VERSION
- echo "$(date +%Y%m%d%H%M%S)" > VERSION
- yum update -y
- ./autogen.sh
- ./configure
......@@ -152,7 +152,7 @@ packages_el6:
stage: packages
image: maikenp/arc-build-centos6
script:
- echo "$(date +%Y%m%dT%H%M%S)_${CI_COMMIT_SHA:0:8}_master" > VERSION
- echo "$(date +%Y%m%d%H%M%S)" > VERSION
- yum update -y
- ./autogen.sh
- ./configure
......@@ -182,7 +182,7 @@ packages_el7:
stage: packages
image: maikenp/arc-build-centos7
script:
- echo "$(date +%Y%m%dT%H%M%S)_${CI_COMMIT_SHA:0:8}_master" > VERSION
- echo "$(date +%Y%m%d%H%M%S)" > VERSION
- yum update -y
- ./autogen.sh
- ./configure
......
......@@ -1851,6 +1851,12 @@ fi
# Check for clock_gettime
AC_SEARCH_LIBS([clock_gettime], [rt])
# Define bash-completion dir
PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0],
[bashcompdir="`pkg-config --variable=completionsdir bash-completion`"],
[bashcompdir="${sysconfdir}/bash_completion.d"])
AC_SUBST([bashcompdir])
# check for fsusage
if test "$enables_hed" = "yes"; then
gl_FSUSAGE
......
......@@ -34,6 +34,7 @@ Build-Depends:
libldns-dev,
libsystemd-dev [linux-any] | debhelper (<< 9.20150101) [linux-any],
libinline-python-perl | dpkg (<< 1.18),
bash-completion | dpkg (<< 1.18),
python-dev | libinline-python-perl (>= 0.56-2~),
python-twisted | libinline-python-perl (>= 0.56-2~),
python-openssl | libinline-python-perl (>= 0.56-2~),
......@@ -207,6 +208,23 @@ Description: ARC LDAP monitor web application
web-based monitor which pulls information from the LDAP information
system and visualizes it.
Package: nordugrid-arc-arcctl
Architecture: any
Depends:
${python:Depends},
${python3:Depends},
libarccommon3 (= ${binary:Version}),
${pydeps:Depends},
lsb-base (>= 3.0-6)
XB-Python-Version: ${python:Versions}
Description: ARC Resource-coupled EXecution service
NorduGrid is a collaboration aiming at development, maintenance and
support of the middleware, known as the Advanced Resource
Connector (ARC).
.
This package contains the ARC Contol Tool with basic set of control
modules suitable for both server and client side.
Package: nordugrid-arc-arex
Provides:
nordugrid-arc-cache-service,
......@@ -232,6 +250,7 @@ Depends:
${python3:Depends},
libarccommon3 (= ${binary:Version}),
nordugrid-arc-hed (= ${binary:Version}),
nordugrid-arc-arcctl (= ${binary:Version}),
nordugrid-arc-plugins-needed (= ${binary:Version}),
libjson-xs-perl,
libxml-simple-perl,
......
......@@ -27,7 +27,6 @@ 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/paths_dist.py*
debian/tmp/usr/lib/python?.?/site-packages/arc/utils
debian/tmp/usr/lib/python?.?/site-packages/arc/control
debian/tmp/usr/share/arc/arc.parser.defaults
debian/tmp/usr/share/arc/sql-schema/legacy_jura_archivedb_schema.sql
debian/tmp/usr/share/arc/schema
......
debian/tmp/usr/lib/python?.?/site-packages/arc/control/__init__.py*
debian/tmp/usr/lib/python?.?/site-packages/arc/control/CertificateGenerator.py*
debian/tmp/usr/lib/python?.?/site-packages/arc/control/ControlCommon.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/TestCA.py*
debian/tmp/usr/lib/python?.?/site-packages/arc/control/ThirdPartyDeployment.py*
debian/tmp/usr/share/man/man1/arcctl.1
debian/tmp/usr/sbin/arcctl
......@@ -65,7 +65,6 @@ debian/tmp/usr/share/arc/lrms_common.sh
debian/tmp/usr/share/arc/sql-schema/arex_accounting_db_schema_v1.sql
debian/tmp/usr/share/man/man1/arc-config-check.1
debian/tmp/usr/share/man/man1/arcctl.1
debian/tmp/usr/share/man/man1/cache-clean.1
debian/tmp/usr/share/man/man1/cache-list.1
debian/tmp/usr/share/man/man1/jura.1
......@@ -75,6 +74,19 @@ debian/tmp/usr/share/man/man8/gm-*.8
debian/tmp/usr/lib/python?.?/site-packages/arc/ssm
debian/tmp/usr/lib/python?.?/site-packages/arc/control/AccountingDB.py*
debian/tmp/usr/lib/python?.?/site-packages/arc/control/AccountingLegacy.py*
debian/tmp/usr/lib/python?.?/site-packages/arc/control/AccountingPublishing.py*
debian/tmp/usr/lib/python?.?/site-packages/arc/control/Accounting.py*
debian/tmp/usr/lib/python?.?/site-packages/arc/control/Cache.py*
debian/tmp/usr/lib/python?.?/site-packages/arc/control/Config.py*
debian/tmp/usr/lib/python?.?/site-packages/arc/control/CECommon.py*
debian/tmp/usr/lib/python?.?/site-packages/arc/control/Jobs.py*
debian/tmp/usr/lib/python?.?/site-packages/arc/control/JuraArchive.py*
debian/tmp/usr/lib/python?.?/site-packages/arc/control/JuraArchiveSQLite.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/arc/arccandypond
debian/tmp/usr/share/arc/rte/ENV/LRMS-SCRATCH
debian/tmp/usr/share/arc/rte/ENV/PROXY
......@@ -83,7 +95,6 @@ debian/tmp/usr/share/arc/rte/ENV/CANDYPOND
debian/tmp/usr/share/arc/rte/ENV/SINGULARITY
debian/tmp/usr/share/arc/rte/ENV/CONDOR/DOCKER
debian/tmp/usr/sbin/arcctl
debian/tmp/usr/sbin/a-rex-backtrace-collect
debian/tmp/etc/arc.conf
......
......@@ -36,3 +36,4 @@ debian/tmp/usr/share/man/man1/arcstat.1
debian/tmp/usr/share/man/man1/arcsub.1
debian/tmp/usr/share/man/man1/arcsync.1
debian/tmp/usr/share/man/man1/arctest.1
debian/tmp/usr/share/bash-completion/completions/arc-client-tools
......@@ -99,6 +99,12 @@ override_dh_auto_install:
find debian/tmp -depth -name __pycache__ -exec rm -rf '{}' ';'
if [ -d debian/tmp/etc/bash_completion.d ]; then \
mkdir -p debian/tmp/usr/share/bash-completion; \
mv debian/tmp/etc/bash_completion.d \
debian/tmp/usr/share/bash-completion/completions; \
fi
mv debian/tmp/etc/init.d/arc-arex \
debian/nordugrid-arc-arex.arc-arex.init
mv debian/tmp/etc/init.d/arched \
......
......@@ -118,6 +118,9 @@
%global with_ldap_service 1
# bash-completion
%global _bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null || echo %{_sysconfdir}/bash_completion.d)
#
# Macros for scripts
#
......@@ -304,9 +307,9 @@ BuildRequires: ldns-devel >= 1.6.8
%endif
%if %{?fedora}%{!?fedora:0} <= 13 && %{?rhel}%{!?rhel:0} <= 6
BuildRequires: python-argparse
Requires: python-argparse
%endif
%if %{?fedora}%{!?fedora:0} >= 13 || %{?rhel}%{!?rhel:0} >= 7 || %{?suse_version:1}%{!?suse_version:0}
Requires: pkgconfig(bash-completion)
Requires: hostname
%else
Requires: net-tools
......@@ -460,12 +463,30 @@ This package contains the PHP web application that is used to set up a
web-based monitor which pulls information from the LDAP information
system and visualizes it.
%package arcctl
Summary: ARC Control Tool
Group: Applications/Internet
Requires: %{name} = %{version}-%{release}
BuildArch: noarch
%if %{?fedora}%{!?fedora:0} <= 13 && %{?rhel}%{!?rhel:0} <= 6
Requires: python-argparse
%endif
%description arcctl
NorduGrid is a collaboration aiming at development, maintenance and
support of the middleware, known as the Advanced Resource
Connector (ARC).
This package contains the ARC Contol Tool with basic set of control
modules suitable for both server and client side.
%package arex
Summary: ARC Resource-coupled EXecution service
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{name}-hed = %{version}-%{release}
Requires: %{name}-plugins-needed = %{version}-%{release}
Requires: %{name}-arcctl = %{version}-%{release}
# remove older SDK package on update to 6.4
%if %{py3default}
Obsoletes: python3-%{name} < 6.4.0
......@@ -1120,6 +1141,7 @@ service arc-infosys-ldap condrestart > /dev/null 2>&1 || :
%{_libexecdir}/%{pkgdir}/arcconfig-parser
%if %{py3default}
%dir %{python3_sitearch}/%{pkgdir}
%{python3_sitearch}/%{pkgdir}/utils
%{python3_sitearch}/%{pkgdir}/__init__.py
%{python3_sitearch}/%{pkgdir}/paths.py
%{python3_sitearch}/%{pkgdir}/paths_dist.py
......@@ -1127,15 +1149,12 @@ service arc-infosys-ldap condrestart > /dev/null 2>&1 || :
%{python3_sitearch}/%{pkgdir}/__pycache__/__init__.*
%{python3_sitearch}/%{pkgdir}/__pycache__/paths.*
%{python3_sitearch}/%{pkgdir}/__pycache__/paths_dist.*
%{python3_sitearch}/%{pkgdir}/utils
%{python3_sitearch}/%{pkgdir}/control
%else
%dir %{python2_sitearch}/%{pkgdir}
%{python2_sitearch}/%{pkgdir}/utils
%{python2_sitearch}/%{pkgdir}/__init__.py*
%{python2_sitearch}/%{pkgdir}/paths.py*
%{python2_sitearch}/%{pkgdir}/paths_dist.py*
%{python2_sitearch}/%{pkgdir}/utils
%{python2_sitearch}/%{pkgdir}/control
%endif
%dir %{_datadir}/%{pkgdir}
%{_datadir}/%{pkgdir}/arc.parser.defaults
......@@ -1145,6 +1164,37 @@ service arc-infosys-ldap condrestart > /dev/null 2>&1 || :
%{_datadir}/%{pkgdir}/test-jobs/test-job-*
%{_datadir}/%{pkgdir}/schema
%files arcctl
%{_sbindir}/arcctl
%if %{py3default}
%dir %{python3_sitearch}/%{pkgdir}/control
%{python3_sitearch}/%{pkgdir}/control/__init__.py
%{python3_sitearch}/%{pkgdir}/control/CertificateGenerator.py
%{python3_sitearch}/%{pkgdir}/control/ControlCommon.py
%{python3_sitearch}/%{pkgdir}/control/OSPackage.py
%{python3_sitearch}/%{pkgdir}/control/OSService.py
%{python3_sitearch}/%{pkgdir}/control/TestCA.py
%{python3_sitearch}/%{pkgdir}/control/ThirdPartyDeployment.py
%dir %{python3_sitearch}/%{pkgdir}/control/__pycache__
%{python3_sitearch}/%{pkgdir}/control/__pycache__/__init__.*
%{python3_sitearch}/%{pkgdir}/control/__pycache__/CertificateGenerator.*
%{python3_sitearch}/%{pkgdir}/control/__pycache__/ControlCommon.*
%{python3_sitearch}/%{pkgdir}/control/__pycache__/OSPackage.*
%{python3_sitearch}/%{pkgdir}/control/__pycache__/OSService.*
%{python3_sitearch}/%{pkgdir}/control/__pycache__/TestCA.*
%{python3_sitearch}/%{pkgdir}/control/__pycache__/ThirdPartyDeployment.*
%else
%dir %{python2_sitearch}/%{pkgdir}/control
%{python2_sitearch}/%{pkgdir}/control/__init__.py*
%{python2_sitearch}/%{pkgdir}/control/CertificateGenerator.py*
%{python2_sitearch}/%{pkgdir}/control/ControlCommon.py*
%{python2_sitearch}/%{pkgdir}/control/OSPackage.py*
%{python2_sitearch}/%{pkgdir}/control/OSService.py*
%{python2_sitearch}/%{pkgdir}/control/TestCA.py*
%{python2_sitearch}/%{pkgdir}/control/ThirdPartyDeployment.py*
%endif
%doc %{_mandir}/man1/arcctl.1*
%files client
%defattr(-,root,root,-)
%doc docdir/client.conf
......@@ -1188,6 +1238,8 @@ service arc-infosys-ldap condrestart > /dev/null 2>&1 || :
%doc %{_mandir}/man1/arcsub.1*
%doc %{_mandir}/man1/arcsync.1*
%doc %{_mandir}/man1/arctest.1*
%dir %{_bashcompdir}
%{_bashcompdir}/arc-client-tools
%files hed
%defattr(-,root,root,-)
......@@ -1320,7 +1372,6 @@ service arc-infosys-ldap condrestart > /dev/null 2>&1 || :
%{_datadir}/%{pkgdir}/PerfData.pl
%{_datadir}/%{pkgdir}/arc-arex-start
%{_datadir}/%{pkgdir}/sql-schema/arex_accounting_db_schema_v1.sql
%doc %{_mandir}/man1/arcctl.1*
%doc %{_mandir}/man1/arc-config-check.1*
%doc %{_mandir}/man1/cache-clean.1*
%doc %{_mandir}/man1/cache-list.1*
......@@ -1339,8 +1390,47 @@ service arc-infosys-ldap condrestart > /dev/null 2>&1 || :
%{_libexecdir}/%{pkgdir}/ssmsend
%if %{py3default}
%{python3_sitearch}/%{pkgdir}/ssm
%dir %{python3_sitearch}/%{pkgdir}/control
%{python3_sitearch}/%{pkgdir}/control/AccountingDB.py
%{python3_sitearch}/%{pkgdir}/control/AccountingLegacy.py
%{python3_sitearch}/%{pkgdir}/control/AccountingPublishing.py
%{python3_sitearch}/%{pkgdir}/control/Accounting.py
%{python3_sitearch}/%{pkgdir}/control/Cache.py
%{python3_sitearch}/%{pkgdir}/control/Config.py
%{python3_sitearch}/%{pkgdir}/control/CECommon.py
%{python3_sitearch}/%{pkgdir}/control/Jobs.py
%{python3_sitearch}/%{pkgdir}/control/JuraArchive.py
%{python3_sitearch}/%{pkgdir}/control/JuraArchiveSQLite.py
%{python3_sitearch}/%{pkgdir}/control/RunTimeEnvironment.py
%{python3_sitearch}/%{pkgdir}/control/Services.py
%dir %{python3_sitearch}/%{pkgdir}/control/__pycache__
%{python3_sitearch}/%{pkgdir}/control/__pycache__/AccountingDB.*
%{python3_sitearch}/%{pkgdir}/control/__pycache__/AccountingLegacy.*
%{python3_sitearch}/%{pkgdir}/control/__pycache__/AccountingPublishing.*
%{python3_sitearch}/%{pkgdir}/control/__pycache__/Accounting.*
%{python3_sitearch}/%{pkgdir}/control/__pycache__/Cache.*
%{python3_sitearch}/%{pkgdir}/control/__pycache__/Config.*
%{python3_sitearch}/%{pkgdir}/control/__pycache__/CECommon.*
%{python3_sitearch}/%{pkgdir}/control/__pycache__/Jobs.*
%{python3_sitearch}/%{pkgdir}/control/__pycache__/JuraArchive.*
%{python3_sitearch}/%{pkgdir}/control/__pycache__/JuraArchiveSQLite.*
%{python3_sitearch}/%{pkgdir}/control/__pycache__/RunTimeEnvironment.*
%{python3_sitearch}/%{pkgdir}/control/__pycache__/Services.*
%else
%{python2_sitearch}/%{pkgdir}/ssm
%dir %{python2_sitearch}/%{pkgdir}/control
%{python2_sitearch}/%{pkgdir}/control/AccountingDB.py*
%{python2_sitearch}/%{pkgdir}/control/AccountingLegacy.py*
%{python2_sitearch}/%{pkgdir}/control/AccountingPublishing.py*
%{python2_sitearch}/%{pkgdir}/control/Accounting.py*
%{python2_sitearch}/%{pkgdir}/control/Cache.py*
%{python2_sitearch}/%{pkgdir}/control/Config.py*
%{python2_sitearch}/%{pkgdir}/control/CECommon.py*
%{python2_sitearch}/%{pkgdir}/control/Jobs.py*
%{python2_sitearch}/%{pkgdir}/control/JuraArchive.py*
%{python2_sitearch}/%{pkgdir}/control/JuraArchiveSQLite.py*
%{python2_sitearch}/%{pkgdir}/control/RunTimeEnvironment.py*
%{python2_sitearch}/%{pkgdir}/control/Services.py*
%endif
%{_libexecdir}/%{pkgdir}/arccandypond
%dir %{_datadir}/%{pkgdir}/rte
......@@ -1353,7 +1443,6 @@ service arc-infosys-ldap condrestart > /dev/null 2>&1 || :
%dir %{_datadir}/%{pkgdir}/rte/ENV/CONDOR
%{_datadir}/%{pkgdir}/rte/ENV/CONDOR/DOCKER
%{_sbindir}/a-rex-backtrace-collect
%{_sbindir}/arcctl
%config(noreplace) %{_sysconfdir}/arc.conf
%if %{with_pythonlrms}
......
Advanced Resource Connector (ARC)
=================================
Release Notes for NorduGrid ARC 6.4.1 02.12.2019
------------------------------------------------------
This is an express release to repair two blocker bugs discovered in ARC.
* An improvement to the handling of xrootd in ARC 6.3.0 (Bugzilla ticket 3870) turned out to break xrootd transfers (see Bugzilla ticket 3890)
As the reimplementation will take too long to properly test, we instead roll back to using the old xrootd implementation.
* Accounting: Since ARC 6.4.0 the accounting could not handle cases when a job was submitted by a proxy without a VO name.
Protection against zero values are now in place.
In addition we have sneaked in a small fix related to PBS, allowing queue names to include a dot.
For information regarding all the changes in the regular 6.4.0 release,
including the new accounting subsystem, please see the release notes at http://www.nordugrid.org/arc/releases/6.4/release_notes_6.4.html
The following Bugzilla tickets are resolved
---------------------------------------------------
* 3890 xrootd transfers don't work (Resolved temporarily by roll-back)
* 3889 Jobs submitted with proxy without VOMS AC extension can corrupt accounting database
* 3888 PBS queue with dots in their names
Documentation
==============
The ARC 6 documentation has been rewritten in a modern format and is
placed at http://www.nordugrid.org/arc/arc6
If you miss something or have questions, please contact us!
Installing ARC 6
=================
We recommend to install ARC release using the Nordugrid repository.
* Start with the basics: http://www.nordugrid.org/arc/arc6/admins/try_arc6.html
* Get production ready: http://www.nordugrid.org/arc/arc6/admins/arc6_install_guide.html
Note that if you instead install from EPEL for RHEL 7 compatible systems,
the ARC 6 packages can be found as nordugrid-arc6-* and not nordugrid-arc-*
This was needed in order to supply both ARC 5 already available for RHEL7 and the new ARC 6.
We provide binary builds for all supported versions of
* Debian (i386 and amd64)
* Fedora (i386 and x86_64)
* CentOS EL6 (i386 and x86_64) and EL7/EL8 (x86_64)
* Ubuntu (i386 and amd64, both LTS and interim releases)
In addition we build nightly packages for older platforms.
Future support of ARC 5-series
===============================
Note that now that ARC 6 is released, we will only provide security updates of ARC 5.
In particular:
1) No new feature development is planned or going on for ARC5 and no bug-fixing development
will happen on ARC5 code base in the future except for security issues.
2) Security fixes for ARC5 will be provided till end of June 2020.
3) Production Sites already running ARC 5 will be able to get deployment and configuration
troubleshooting help via GGUS till end June 2021. This we call "operational site support".
4) ARC5 is available in EPEL7 and will stay there. EPEL8 will only contain ARC 6.
Getting in touch
==================
If you need help with the configuration file or have any other questions related to ARC 6, please contact us via
* Email: nordugrid-discuss@nordugrid.org
* Skype channel dedicated to ARC 6 support: https://join.skype.com/dyf3A6Uutjy2
......@@ -21,7 +21,17 @@ DIST_SUBDIRS = data credentials compute
arcsysconfdir = $(sysconfdir)/arc
arcsysconf_DATA = client.conf
exampledir = $(pkgdatadir)/examples
example_DATA = client.conf
EXTRA_DIST = $(example_DATA) $(arcsysconf_DATA)
BASH_COMPLETION_SOURCE = client.bash_completion
arc-client-tools: $(BASH_COMPLETION_SOURCE)
cp $< $@
bashcompletiondir = $(bashcompdir)
bashcompletion_DATA = arc-client-tools
EXTRA_DIST = $(example_DATA) $(arcsysconf_DATA) $(BASH_COMPLETION_SOURCE)
#
# Completion for NorduGrid ARC command line tools:
#
_arccli()
{
local cur prev opts
COMPREPLY=()
command="${COMP_WORDS[0]}"
cur="${COMP_WORDS[COMP_CWORD]}"
prev="${COMP_WORDS[COMP_CWORD-1]}"
opts=`$command --help| grep -- --| cut -d" " -f 4| sed "s/=.*//"|uniq; \
$command --help| grep -- --| cut -d" " -f 3| sed "s/,//"|uniq`
# debug levels completion
if [ "x${prev}" = "x-d" -o "x${prev}" = "x--debug" ]; then
COMPREPLY=( $(compgen -W "FATAL ERROR WARNING INFO VERBOSE DEBUG" ${cur}) )
return 0
fi
# interface types completion
if [ "x$command" = "xarcsub" -o "x$command" = "xarctest" ]; then
if [ "x${prev}" = "x-T" -o "x${prev}" = "x--submission-endpoint-type" ]; then
COMPREPLY=( $(compgen -W "emies arcrest gridftpjob internal" ${cur}) )
return 0
elif [ "x${prev}" = "x-Q" -o "x${prev}" = "x--info-endpoint-type" ]; then
COMPREPLY=( $(compgen -W "emies arcrest ldap.nordugrid ldap.glue2 internal NONE" ${cur}) )
return 0
fi
fi
COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
}
complete -F _arccli arccat
complete -F _arccli arcclean
complete -F _arccli arccp
complete -F _arccli arcget
complete -F _arccli arcinfo
complete -F _arccli arckill
complete -F _arccli arcls
complete -F _arccli arcmkdir
complete -F _arccli arcproxy
complete -F _arccli arcrename
complete -F _arccli arcrenew
complete -F _arccli arcresub
complete -F _arccli arcresume
complete -F _arccli arcrm
complete -F _arccli arcstat
complete -F _arccli arcsub
complete -F _arccli arcsync
complete -F _arccli arctest
[common]
# The location of credentials can be specified by using the 'proxypath',
# 'keypath' or 'certificatepath' attribute, in case they are located
# in a non-standard location.
#proxypath=/tmp/my-proxy
#keypath=/home/username/key.pem
#certificatepath=/home/username/cert.pem
## certificatepath = path - Specify the location of client certificate file.
## Environmental variable X509_USER_CERT redefines this value.
## default: $HOME/.globus/usercert.pem
#certificatepath=/home/user/credentials/cert.pem
# The location of the directory containing CA-certificates can also be
# specified.
#cacertificatesdirectory=/home/user/cacertificates
## keypath = path - Specify the location of client secret key file.
## Environmental variable X509_USER_KEY redefines this value.
## default: $HOME/.globus/userkey.pem
#keypath=/home/user/credentials/key.pem
# Rejected services.
# The attribute 'rejectdiscovery' can be used to indicate that during service discovery
# (when retrieving services from the registries) the services with the given URLs should be skipped
## cacertificatesdirectory = path - Specify the location of CA certificates directory
## Environmental variable X509_CERT_DIR redefines this value.
## default: /etc/grid-security/certificates
#cacertificatesdirectory=/home/user/.globus/certificates
## proxypath = path - Specify the location of proxy certificate (both for generation and usage)
## Environmental variable X509_USER_PROXY redefines this value.
## default: /tmp/x509up_u${UID}
#proxypath=/home/user/credentials/proxy.pem
## vomsespath = path - Path to file or directory that holds client VOMS configuration
## to generate proxy certificates
## Environmental variables X509_VOMS_FILE and X509_VOMSES redefine this value
## If missing arcproxy will search for vomses in the following locations:
## - ~/.arc/vomses
## - ~/.voms/vomses
## - /etc/vomses
## - /etc/grid-security/vomses
## default: undefined
#vomsespath=/home/user/credentials/vomses
## defaultvoms = vo[:command] - Default value for --voms (-S) arcproxy option that is
## used to define VO and optionaly FQANs used during proxy certificate generation
## multivalued
## default: undefined
#defaultvoms=atlas:/atlas/Role=pilot
#defaultvoms=nordugrid.org:all
#defaultvoms=ops.ndgf.org
## rejectdiscovery = service - Specify the FQDN or URLs of the services that should be rejected
## during service discovery process by CLI tools (arcsub, arctest, arcresub)
## multivalued
## default: undefined
#rejectdiscovery=bad.service.org
#rejectdiscovery=bad2.service.org
# The attribute 'rejectmanagement' can be used to indicate that during job management
# those jobs should be skipped which are on a computing element with the given URLs
## rejectmanagement = service - Specify the FQDN or URLs of the CEs that should be skipped
## during the job management (e.g. arcstat, arckill)
## multivalued
## default: undefined
#rejectmanagement=bad3.service.org
#rejectmanagement=bad4.service.org
# Specify the broker used in resource discovery. The default broker is
# the 'Random' broker.
## brokername = broker - Specify the broker used in resource discovery.
## The full list of installed brokers can be obtained running "arcsub -P"
## default: Random
#brokername=FastestQueue
# Some brokers takes arguments and these can be specified by using the
# 'brokerarguments' attribute.
#brokerarguments=
# Set the period of time the client should wait for a service to respond
# when communicating with it. The period should be given in seconds.
#timeout=50
# Path to the job list file can be specified with the joblistfile
# attribute. This file will be used by commands such as arcsub, arcstat,
# arcsync etc. to read and write information about jobs. The default
# location of the file is in home directory in the .arc directory with
# name jobs.dat
#joblist=/home/user/run/jobs.dat
#joblist=C:\\run\jobs.dat
#
# The type of storage used to store job information can be configured with the
# 'joblisttype' attribute. Two types are currently supported XML and BDB. With
# XML the job information is stored in a file using plain XML, whereas with BDB
# job information is stored in a database file using the Berkeley DB format.
#joblisttype=BDB
#joblisttype=XML
# The location of the vomses file or vomses directory
#vomsespath=/home/user/vomses
# The default VOMS VO to be used while generating credentials proxy
#defaultvoms=nordugrid.org
#defaultvoms=atlas
# List of services
## brokerarguments = args - Specify broker arguments (if applicable to specified broker)
## default: undefined
#brokername=PythonBroker
#brokerarguments=ACIXBroker.ACIXBroker:https://cacheindex.ndgf.org:6443/data/index
# Minimal service entry:
# [type/alias]
# url=hostname
#
# where type can be "registry" or "computing",
# and alias should be a unique string without whitespace
# this service can be referred in the command line by its alias:
# -c alias (for a computing element)
# -g alias (for a registry)
## timeout = seconds - Amount of time to wait for a service to respond before
## considering it dead.
## default: 20
#timeout=60
# Services can be grouped by adding a "group=groupname" option to its section
# Referring to the name of a group in the command line selects all services in that group:
# -c group (for computing elements)
# -g group (for registries)
## joblist = path - Path to the jobs database that holds all extra data
## about submitted jobs to be used during further job management
## default: $HOME/.arc/jobs.dat
#joblist=/home/user/arcjobs.dat
# Services can be set as default by adding a "default=yes" option to its section
# If no services are selected in the command line, the defaults will be used
# The interface of the services can be specified with the following options:
# registryinterface=InterfaceName (for a registry)
# possible options: org.nordugrid.ldapegiis, org.nordugrid.archery
# infointerface=InterfaceName (for getting information about a computing element)
# possible options: org.nordugrid.ldapng, org.nordugrid.ldapglue2, org.nordugrid.arcrest, org.ogf.glue.emies.resourceinfo
# submissioninterface=InterfaceName (for submitting job to a computing element)
# possible options: org.nordugrid.gridftpjob, org.nordugrid.arcrest, org.ogf.glue.emies.activitycreation
#
# If the interface is not specified, all possible interfaces will be tried.
# The infointerface and the submissioninterface can be specified also in the common section,
# which will apply for all the services which has no interface specified.
#[registry/index1]
#url=ldap://index1.nordugrid.org:2135/Mds-Vo-name=NorduGrid,o=grid
#registryinterface=org.nordugrid.ldapegiis
#default=yes
#
#[registry/index2]
#url=ldap://index2.nordugrid.org:2135/Mds-Vo-name=NorduGrid,o=grid
#registryinterface=org.nordugrid.ldapegiis
#default=yes
#
#[registry/index3]
#url=ldap://index3.nordugrid.org:2135/Mds-Vo-name=NorduGrid,o=grid
#registryinterface=org.nordugrid.ldapegiis
#default=yes
#
#[registry/index4]
#url=ldap://index4.nordugrid.org:2135/Mds-Vo-name=NorduGrid,o=grid
#registryinterface=org.nordugrid.ldapegiis
#default=yes
#
#[computing/interop]
#url=https://interop.grid.niif.hu:2010/arex-x509
#default=yes
## joblisttype = type - Type of the backend used for jobs database.
## IT IS STRONGLY advised to keep default SQLITE type of backend.
## allowedvalues: SQLITE, BDB, XML
## default: SQLITE
#joblisttype=XML
......@@ -12,12 +12,12 @@ CLILIBS = \
$(top_builddir)/src/hed/libs/loader/libarcloader.la \
$(top_builddir)/src/hed/libs/common/libarccommon.la
arcsub_SOURCES = arcsub.cpp utils.cpp utils.h
arcsub_SOURCES = arcsub.cpp utils.cpp utils.h submit.cpp submit.h
arcsub_CXXFLAGS = -I$(top_srcdir)/include \
$(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) $(OPENSSL_CFLAGS) $(DBCXX_CPPFLAGS) $(AM_CXXFLAGS)
arcsub_LDADD = $(CLILIBS) $(GLIBMM_LIBS) $(LIBXML2_LIBS) $(OPENSSL_LIBS) $(DBCXX_LIBS)
arctest_SOURCES = arctest.cpp utils.cpp utils.h
arctest_SOURCES = arctest.cpp utils.cpp utils.h submit.cpp submit.h
arctest_CXXFLAGS = -I$(top_srcdir)/include \
$(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) $(OPENSSL_CFLAGS) $(DBCXX_CPPFLAGS) $(AM_CXXFLAGS)
arctest_LDADD = $(CLILIBS) $(GLIBMM_LIBS) $(LIBXML2_LIBS) $(OPENSSL_LIBS) $(DBCXX_LIBS)
......@@ -57,7 +57,7 @@ arcsync_CXXFLAGS = -I$(top_srcdir)/include \
$(GLIBMM_CFLAGS) $(LIBXML2_CFLAGS) $(OPENSSL_CFLAGS) $(DBCXX_CPPFLAGS) $(AM_CXXFLAGS)
arcsync_LDADD = $(CLILIBS) $(GLIBMM_LIBS) $(LIBXML2_LIBS) $(OPENSSL_LIBS) $(DBCXX_LIBS)
arcresub_SOURCES = arcresub.cpp utils.cpp utils.h
arcresub_SOURCES = arcresub.cpp utils.cpp utils.h submit.cpp submit.h
arcresub_CXXFLAGS = -I$(top_srcdir)/include \