diff --git a/roles/karaage3.1.17/tasks/karaage.yml b/roles/karaage3.1.17/tasks/karaage.yml index f07bbfc1d6e00f873ab670258de88447cc2cb608..c96fbe186fa495017ae8c796c90c823a658b164e 100644 --- a/roles/karaage3.1.17/tasks/karaage.yml +++ b/roles/karaage3.1.17/tasks/karaage.yml @@ -138,10 +138,10 @@ sudo: true when: karaage_db_init.stdout.find("0") == 0 -- - name: "Create IDP institutes" - shell: kg-idps - sudo: true +#- +# name: "Create IDP institutes (disable it as cache is not available)" +# shell: kg-idps +# sudo: true - name: install postfix apt: name=postfix state=present diff --git a/roles/karaage3.1.17/templates/index.html.j2 b/roles/karaage3.1.17/templates/index.html.j2 index 750ce99820ee519a62b19030c326e4248c0a562c..4e1fda227b355c5e60c9f80b410a7873d07ca4ec 100644 --- a/roles/karaage3.1.17/templates/index.html.j2 +++ b/roles/karaage3.1.17/templates/index.html.j2 @@ -1,4 +1,4 @@ <html><body><h3>HPC identity management</h3> -<p>To log in via AAF authentication, connect to URL: https://{{ ansible_fqdn }}/aafbootstrap</p> -<p>To log in without AAF authentication, connect to URL: https://{{ ansible_fqdn }}/users</p> +<p>To log in via AAF authentication, connect to <a href=https://{{ ansible_fqdn }}/aafbootstrap>aafbootstrap</a></p> +<p>To log in without AAF authentication, connect to <a href=https://{{ ansible_fqdn }}/users>users</a></p> </body></html> diff --git a/roles/karaage3.1.17/templates/karaage3-wsgi.conf.j2 b/roles/karaage3.1.17/templates/karaage3-wsgi.conf.j2 index 813a86f403c9d0e75092c27797e575e87e79140c..e2c20ae5fa4a124cbaad448a6c3752956bfdd231 100644 --- a/roles/karaage3.1.17/templates/karaage3-wsgi.conf.j2 +++ b/roles/karaage3.1.17/templates/karaage3-wsgi.conf.j2 @@ -1,6 +1,7 @@ #-*-apache-*- WSGIScriptAlias /karaage /etc/karaage3/karaage.wsgi +WSGIScriptAlias /aafbootstrap /etc/karaage3/karaage.wsgi <IfVersion >= 2.4> <Directory /etc/karaage3> <Files karaage.wsgi> diff --git a/roles/karaage3.1.17/templates/settings.py.j2 b/roles/karaage3.1.17/templates/settings.py.j2 index ceb441480ac8dd5bfb897fa8da95b5c4e7bc6b26..b2ff33d80ddcc6895b54006b070faaf374a8861a 100644 --- a/roles/karaage3.1.17/templates/settings.py.j2 +++ b/roles/karaage3.1.17/templates/settings.py.j2 @@ -82,6 +82,7 @@ MANAGERS = ADMINS DEFAULT_PROJECT_PID = "{{ defaultProject }}" DEFAULT_MACHINE_CATEGORY_NAME = "{{ defaultMachineCategory }}" {% endif %} +DEFAULT_INSTITUTE_NAME = "Monash University" # A dictionary containing the settings for all databases to be used with # Django. It is a nested dictionary whose contents maps database aliases to a