Here is a tentative patch.
diff --git a/debian/patches/default_debian_config b/debian/patches/default_debian_config
index 77ba593..9415fd3 100644
--- a/debian/patches/default_debian_config
+++ b/debian/patches/default_debian_config
@@ -90,3 +90,32 @@ Author: Michael Hanke <m...@debian.org>
  type=path
  review=?
  [CREDD_ARGS]
+--- a/src/condor_examples/condor_config.generic.debian.patch
++++ b/src/condor_examples/condor_config.generic.debian.patch
+@@ -29,7 +29,7 @@
+  #LOCAL_CONFIG_DIR_EXCLUDE_REGEXP = ^((\..*)|(.*~)|(#.*)|(.*\.rpmsave)|(.*\.rpmnew))$
+  
+  ##  Use a host-based security policy. By default CONDOR_HOST and the local machine will be allowed
+-@@ -50,5 +48,24 @@
++@@ -50,5 +48,29 @@
+  #FLOCK_TO = condor.cs.wisc.edu, cm.example.edu
+  
+  ##--------------------------------------------------------------------
+@@ -45,7 +45,7 @@
+ +RUN     = $(LOCAL_DIR)/run/condor
+ +LOG     = $(LOCAL_DIR)/log/condor
+ +LOCK    = $(LOCAL_DIR)/lock/condor
+-+SPOOL   = $(LOCAL_DIR)/lib/condor/spool
+++SPOOL   = $(LOCAL_DIR)/spool/condor
+ +EXECUTE = $(LOCAL_DIR)/lib/condor/execute
+ +BIN     = $(RELEASE_DIR)/bin
+ +LIB     = $(RELEASE_DIR)/lib/condor
+@@ -55,3 +55,8 @@
+ +SHARE   = $(RELEASE_DIR)/share/condor
+ +
+ +PROCD_ADDRESS = $(RUN)/procd_pipe
+++
+++CONDOR_DEVELOPERS = NONE
+++CONDOR_DEVELOPERS_COLLECTOR = NONE
+++
+++SSH_TO_JOB_SSHD_CONFIG_TEMPLATE = /etc/condor/condor_ssh_to_job_sshd_config_template
diff --git a/debian/rules b/debian/rules
index df092db..74b2bb9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -106,13 +106,6 @@ override_dh_install:
 	chrpath -d debian/libclassad*/usr/lib/libclassad.so.*.*
 	# kill the default local config -- debconf will handle that
 	rm debian/htcondor/etc/condor/condor_config.local
-	# modify condor config file with default Debian config
-	# no default chatter to upstream
-	echo "CONDOR_DEVELOPERS = NONE" >> debian/htcondor/etc/condor/condor_config
-	echo "CONDOR_DEVELOPERS_COLLECTOR = NONE" >> debian/htcondor/etc/condor/condor_config
-	# SSH template is a config file
-	echo "SSH_TO_JOB_SSHD_CONFIG_TEMPLATE = /etc/condor/condor_ssh_to_job_sshd_config_template" \
-		>> debian/htcondor/etc/condor/condor_config
 
 override_dh_auto_clean:
 	dh_auto_clean

Reply via email to