removed the creation of .nimbus/ and added an entry to the cumulus.in…

…i path search. it now looks in $CUMULUS_HOME/etc/cumulus.ini as well

cumulus/cb/pycb/__init__.py

@@ -69,6 +69,7 @@ def __init__(self):
 The search path for cumulus.ini is:
 
     /etc/nimbus/cumulus.ini
+    $CUMULUS_HOME/etc/cumulus.ini
     ~/.nimbus/cumulus.ini
     cumulus.ini
     env 'CUMULUS_SETTINGS_FILE
@@ -111,6 +112,8 @@ def get_contact(self):
     def load_settings(self):
         config_path = []
         config_path.append("/etc/nimbus/cumulus.ini")
+        if 'CUMULUS_HOME' in os.environ:
+            config_path.append(os.path.join(os.environ['CUMULUS_HOME'], "etc/cumulus.ini"))
         config_path.append(os.path.expanduser('~/.nimbus/cumulus.ini'))
         config_path.append(os.path.expanduser('cumulus.ini'))
         config_path.append(os.environ.get('CUMULUS_SETTINGS_FILE'))

cumulus/conf/Makefile.am

@@ -32,7 +32,6 @@ tests:
 	(cd $(cumulus_dst_dir)/tests && ./run-all.sh)
 
 install: predest
-	cp $(cumulus_src_dir)/etc/cumulus.ini ~/.nimbus
 	cp -r $(cumulus_src_dir)/etc $(cumulus_dst_dir)
 	cp -r $(cumulus_src_dir)/etc/env.sh $(cumulus_dst_dir)
 	$(SQLITE) $(AUTHZDB) < $(cumulus_src_dir)/etc/acl.sql

cumulus/conf/Makefile.in

@@ -498,7 +498,6 @@ tests:
 	(cd $(cumulus_dst_dir)/tests && ./run-all.sh)
 
 install: predest
-	cp $(cumulus_src_dir)/etc/cumulus.ini ~/.nimbus
 	cp -r $(cumulus_src_dir)/etc $(cumulus_dst_dir)
 	cp -r $(cumulus_src_dir)/etc/env.sh $(cumulus_dst_dir)
 	$(SQLITE) $(AUTHZDB) < $(cumulus_src_dir)/etc/acl.sql

cumulus/cumulus-install.sh

@@ -65,29 +65,6 @@ else
 
 fi
 
-if [ -e $HOME/.nimbus ]; then
-    if [ ! -d $HOME/.nimbus ]; then
-        echo "~/.nimbus exists but it is a regular file, not a directory."
-        echo "This installation program needs to create the directory ~/.nimbus."
-        echo "please rename your existing file"
-        exit 1
-    fi
-fi
-
-if [ ! -e $HOME/.nimbus ]; then
-    mkdir $HOME/.nimbus
-    if [ $? -ne 0 ]; then
-        echo "mkdir ~/.nimbus failed"
-        exit 1
-    fi
-fi
-if [ -e $HOME/.nimbus/cumulus.ini ]; then 
-    echo "----- WARNING -----"
-    bkup=$HOME/.nimbus/cumulus.ini.`date +%s`
-    echo "$HOME/.nimbus/cumulus.ini exists, moving it to $bkup"
-    mv $HOME/.nimbus/cumulus.ini $bkup
-fi
-
 cd $source_dir/deps
 if [ $? -ne 0 ]; then
     echo "Could not change to the deps directory"