fixed production config

roles/karaage3.1.17/tasks/karaage.yml

@@ -51,7 +51,7 @@
 
 -
  name: "Getting Karaage from Github"
- git: repo="https://github.com/monash-merc/karaage.git" dest="/root/karaage3.1.7" force=yes
+ git: repo="https://github.com/monash-merc/karaage.git" dest="/root/karaage3.1.7" {% if karaage_source_version is defined %}version="{{ karaage_source_version }}" {% endif %} force=yes
  sudo: true
 
 -
@@ -116,7 +116,7 @@
   sudo: true
 
 - name: install shibboleth cache file 
-  template: src=metadata.aaf.xml.j2 dest=/tmp/metadata.aaf.xml 
+  template: src="{{ shibboleth_deploy }}_metadata.aaf.xml.j2" dest=/tmp/metadata.aaf.xml 
 
 -
  name: "enabling Karaage configuration"
@@ -191,3 +191,10 @@
   cron: name=idps job=/usr/bin/kg-idps user=root day=*/1 state=present
   sudo: true
 
+-
+ name: "Templating username list"
+ template: src=files/{{ item }} dest=/{{ user_id_file_dir }}/{{ item }}
+ with_items: user_id_file
+ sudo: true
+ when: user_id_file is defined and user_id_file_dir is defined
+

roles/karaage3.1.17/templates/kg_init.j2

 #!/usr/bin/python
 
-import os, sys
+import os, sys, time
 os.environ['DJANGO_SETTINGS_MODULE'] = "karaage.conf.settings"
 from django.conf import settings
 from karaage.projects.models import Project
@@ -19,6 +19,7 @@ class HpcIdInit():
         self.path = configfile 
         self.password = password
         self.debug = debug
+        self.logfile = None
         if not debug:
             self.logfile = open("/tmp/kg_init.log", "w") 
 
@@ -32,13 +33,16 @@ class HpcIdInit():
             log("Invalid input data")    
 
     def __del__(self):
-        self.logfile.close()
+        if self.logfile:  
+            if not self.logfile.closed():
+                self.logfile.close()
 
     def log(self, message):
         if self.debug:
             print message
         else:
-            self.logfile.write(message + "\n") 
+            now = time.strftime("%c")
+            self.logfile.write(now + ": " + message + "\n") 
 
     def getGroup(self, name):
         group = None
@@ -185,6 +189,7 @@ class HpcIdInit():
             if len(delegates) == 0:
                 self.log("Create institution delegate %s"%(su.username))
                 institute.delegates.add(su)
+                self.log("Create institution delegate %s OK"%(su.username))
         except:
             result = False 
             self.log("Create institution delegate exception: %s" %(traceback.format_exc()))
@@ -192,7 +197,7 @@ class HpcIdInit():
             return result 
 
     def setup(self):
-        self.log("Password = %s, debug = %s" %(self.password, self.debug))
+        self.log("Debug = %s" %(self.debug))
         su = self.getUser(self.user["username"])
         if su:
             self.log("Find super user %s" %(su.username))

roles/karaage3.1.17/templates/settings.py.j2

@@ -31,7 +31,8 @@
 #
 # DEBUG = True
 
-{% if user_id_file is defined %}
+{% if user_id_file is defined and user_id_file_dir is defined %}
+USER_ID_DIR = "{{ user_id_file_dir }}"
 USER_ID_FILES = {{ user_id_file }}
 {% endif %}