Merge pull request htcondor#59 from JaimeFrey/HTCONDOR-521-config-dir

Add config.d-style directory HTCONDOR-521 HTCONDOR-614
JaimeFrey · Aug 3, 2021 · 4fdba4f · 4fdba4f
2 parents b30f6bf + b5a3a3c
commit 4fdba4f
Show file tree

Hide file tree

Showing 12 changed files with 224 additions and 150 deletions.
diff --git a/config/glite-ce-blahparser b/config/glite-ce-blahparser
@@ -34,19 +34,15 @@ if [ ! -d "$BLAHPD_LOCATION" ]; then
 fi
 
 if [ ! -r "$BLAHPD_CONFIG_LOCATION" ]; then
-  if [ -r "/etc/batch_gahp.config" ]; then
-    export BLAHPD_CONFIG_LOCATION="/etc/batch_gahp.config"
-  elif [ -r "${BLAHPD_LOCATION:-/opt/glite}/etc/batch_gahp.config" ]; then
-    export BLAHPD_CONFIG_LOCATION="${BLAHPD_LOCATION:-/opt/glite}/etc/batch_gahp.config"
-  elif [ -r "/etc/blah.config" ]; then
+  if [ -r "/etc/blah.config" ]; then
     export BLAHPD_CONFIG_LOCATION="/etc/blah.config"
   elif [ -r "${BLAHPD_LOCATION:-/opt/glite}/etc/blah.config" ]; then
     export BLAHPD_CONFIG_LOCATION="${BLAHPD_LOCATION:-/opt/glite}/etc/blah.config"
   fi
 fi
 
 if [ ! -r "$BLAHPD_CONFIG_LOCATION" ]; then
-  echo "$0: Cannot read BLAH config file (\$BLAHPD_CONFIG_LOCATION, or /etc/batch_gahp.config, or /opt/glite/etc/batch_gahp.config, or /etc/blah.config, or /opt/glite/etc/blah.config)"
+  echo "$0: Cannot read BLAH config file (\$BLAHPD_CONFIG_LOCATION, or /etc/blah.config, or /opt/glite/etc/blah.config)"
   exit 1
 fi
 

diff --git a/src/blahpd.h b/src/blahpd.h
@@ -36,8 +36,8 @@
 
 #define RCSID_VERSION		"$GahpVersion: %s Mar 31 2008 INFN\\ blahpd\\ (%s) $"
 
-#define DEFAULT_GLITE_LOCATION "/opt/glite"
-#define DEFAULT_GLEXEC_COMMAND "/opt/glite/sbin/glexec"
+#define DEFAULT_GLITE_LOCATION "/usr"
+#define DEFAULT_GLEXEC_COMMAND "/usr/sbin/glexec"
 #define DEFAULT_SUDO_COMMAND "/usr/bin/sudo"
 
 /* Change this in order to select the default batch system