Skip to content
Snippets Groups Projects
Commit eb1aa4dc authored by Jupiter Hu's avatar Jupiter Hu
Browse files

Merge pull request #123 from CVL-GitHub/hpcidbranch8 

Fixed common name tag
parents bc1bf720 ee1e75ce
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 108 additions and 4 deletions
roles/karaage3.1.17/tasks/karaage.yml
+ 15
− 0
View file @ eb1aa4dc
...@@ -95,6 +95,13 @@ ...@@ -95,6 +95,13 @@
template: src=karaage3-wsgi.conf.j2 dest=/etc/apache2/conf-available/karaage3-wsgi.conf template: src=karaage3-wsgi.conf.j2 dest=/etc/apache2/conf-available/karaage3-wsgi.conf
sudo: true sudo: true
- name: install karaage3-wsgi.conf
template: src=index.html.j2 dest=/var/www/index.html
sudo: true
- name: install karaage3-wsgi.conf
template: src=kg-idps.j2 dest=/usr/bin/kg-idps mode=755
sudo: true
- -
name: "enabling Karaage configuration" name: "enabling Karaage configuration"
shell: a2enconf karaage3-wsgi shell: a2enconf karaage3-wsgi
...@@ -131,6 +138,11 @@ ...@@ -131,6 +138,11 @@
sudo: true sudo: true
when: karaage_db_init.stdout.find("0") == 0 when: karaage_db_init.stdout.find("0") == 0
#-
# name: "Create IDP institutes (disable it as cache is not available)"
# shell: kg-idps
# sudo: true
- name: install postfix - name: install postfix
apt: name=postfix state=present apt: name=postfix state=present
sudo: true sudo: true
...@@ -152,4 +164,7 @@ ...@@ -152,4 +164,7 @@
sudo: true sudo: true
when: ansible_os_family == "RedHat" when: ansible_os_family == "RedHat"
- name: "Start cron job for creating idps"
cron: name=idps job=/usr/bin/kg-idps user=root day=*/1 state=present
sudo: true
roles/karaage3.1.17/templates/index.html.j2 0 → 100644
+ 4
− 0
View file @ eb1aa4dc
<html><body><h3>HPC identity management</h3>
<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>
roles/karaage3.1.17/templates/karaage3-wsgi.conf.j2
+ 3
− 1
View file @ eb1aa4dc
#-*-apache-*- #-*-apache-*-
WSGIScriptAlias /karaage /etc/karaage3/karaage.wsgi WSGIScriptAlias /karaage /etc/karaage3/karaage.wsgi
WSGIScriptAlias /aafbootstrap /etc/karaage3/karaage.wsgi
<IfVersion >= 2.4> <IfVersion >= 2.4>
<Directory /etc/karaage3> <Directory /etc/karaage3>
<Files karaage.wsgi> <Files karaage.wsgi>
...@@ -12,6 +13,7 @@ WSGIScriptAlias /karaage /etc/karaage3/karaage.wsgi ...@@ -12,6 +13,7 @@ WSGIScriptAlias /karaage /etc/karaage3/karaage.wsgi
# support old URLs. # support old URLs.
Redirect permanent /kgadmin /karaage Redirect permanent /kgadmin /karaage
Redirect permanent /users /karaage Redirect permanent /users /karaage
Redirect permanent /aafbootstrap /karaage/aafbootstrap
Alias /kgstatic "/var/lib/karaage3/static" Alias /kgstatic "/var/lib/karaage3/static"
<Location "/kgstatic"> <Location "/kgstatic">
...@@ -29,7 +31,7 @@ Alias /kgfiles "/var/cache/karaage3/files" ...@@ -29,7 +31,7 @@ Alias /kgfiles "/var/cache/karaage3/files"
</IfVersion> </IfVersion>
</Location> </Location>
<Location /karaage> <Location /karaage/aafbootstrap>
AuthType Shibboleth AuthType Shibboleth
ShibRequireSession On ShibRequireSession On
ShibUseHeaders On ShibUseHeaders On
......
roles/karaage3.1.17/templates/kg-idps.j2 0 → 100755
+ 76
− 0
View file @ eb1aa4dc
#!/usr/bin/python
import os
import django
os.environ['DJANGO_SETTINGS_MODULE'] = "karaage.conf.settings"
def get_idps_from_metadata():
import xml.etree.ElementTree as ET
tree = ET.parse('/var/cache/shibboleth/metadata.aaf.xml')
root=tree.getroot()
idps=[]
for entity in root.findall("{urn:oasis:names:tc:SAML:2.0:metadata}EntityDescriptor"):
idp=False
# %s"%entity.attrib['entityID']
for idp in entity.findall('{urn:oasis:names:tc:SAML:2.0:metadata}IDPSSODescriptor'):
idp=True
if idp:
for o in entity.findall('{urn:oasis:names:tc:SAML:2.0:metadata}Organization'):
for c in o.findall('{urn:oasis:names:tc:SAML:2.0:metadata}OrganizationDisplayName'):
idps.append({'entityID':entity.attrib['entityID'],'name':c.text})
return idps
def get_next_idp_group():
from karaage.people.models import Group
i=-1
available=False
nextgroup=None
groupname='idpgroup{idx}'
while not available:
i=i+1
try:
group =Group.objects.get(name=groupname.format(idx=i))
except Group.DoesNotExist:
available=True
nextgroup=groupname.format(idx=i)
return nextgroup
def get_or_create_idp(entityID,name):
print "get_or_create %s"%name
from karaage.institutes.forms import InstituteForm
from karaage.institutes.models import Institute
from karaage.people.models import Group
try:
Institute.objects.get(saml_entityid=entityID)
return
except Institute.DoesNotExist:
print "does not exists, creating"
groupname=get_next_idp_group()
group, _ =Group.objects.get_or_create(name=groupname)
institute=Institute(name=name,group=group,saml_entityid=entityID,is_active=True)
institute.save()
#
# d={}
# d['name']=name
# d['group_id']=group
# d['saml_entityid']=entityID
# d['is_active']=True
# form=InstituteForm(d)
# if form.is_valid():
# print "tying to save"
# form.save()
# else:
# print "form not valid"
# print dir(form)
# #print "not actually saving my form"
django.setup()
idps = get_idps_from_metadata()
for idp in idps:
try:
get_or_create_idp(entityID=idp['entityID'],name=idp['name'])
except:
pass
roles/karaage3.1.17/templates/settings.py.j2
+ 7
− 0
View file @ eb1aa4dc
...@@ -82,6 +82,13 @@ MANAGERS = ADMINS ...@@ -82,6 +82,13 @@ MANAGERS = ADMINS
DEFAULT_PROJECT_PID = "{{ defaultProject }}" DEFAULT_PROJECT_PID = "{{ defaultProject }}"
DEFAULT_MACHINE_CATEGORY_NAME = "{{ defaultMachineCategory }}" DEFAULT_MACHINE_CATEGORY_NAME = "{{ defaultMachineCategory }}"
{% endif %} {% endif %}
DEFAULT_INSTITUTE_NAME = "Monash University"
DEFAULT_PROJECTS = [
{"project_name": "MCC2", "pid": "pMcc2", "institute_name": "Monash University"},
{"project_name": "MCC3", "pid": "pMcc3", "institute_name": "Monash University"},
{"project_name": "MASSIVE", "pid": "pMassive", "institute_name": "Monash University"},
{"project_name": "CVL", "pid": "pCvl", "institute_name": "Monash University"}
]
# A dictionary containing the settings for all databases to be used with # 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 # Django. It is a nested dictionary whose contents maps database aliases to a
......
roles/shibboleth-sp/templates/attribute-map.xml.j2
+ 1
− 1
View file @ eb1aa4dc
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
<Attribute name="urn:oid:1.3.6.1.4.1.5923.1.6.1.2" id="eduCourseMember"/> <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.6.1.2" id="eduCourseMember"/>
--> -->
<!-- Added BY Shahaan --> <!-- Added BY Shahaan -->
<Attribute name="urn:oid:2.5.4.3" id="commonName"/> <Attribute name="urn:oid:2.5.4.3" id="cn"/>
<Attribute name="urn:oid:2.5.4.4" id="sn"/> <Attribute name="urn:oid:2.5.4.4" id="sn"/>
<Attribute name="urn:oid:0.9.2342.19200300.100.1.3" id="mail"/> <Attribute name="urn:oid:0.9.2342.19200300.100.1.3" id="mail"/>
<Attribute name="urn:oid:2.5.4.42" id="givenName"/> <Attribute name="urn:oid:2.5.4.42" id="givenName"/>
......
roles/slurm-common/templates/nhc.sysconfig.j2
+ 2
− 2
View file @ eb1aa4dc
...@@ -5,8 +5,8 @@ PATH={{ slurm_dir }}/bin:{{ nhc_dir }}/sbin:$PATH ...@@ -5,8 +5,8 @@ PATH={{ slurm_dir }}/bin:{{ nhc_dir }}/sbin:$PATH
LOGFILE=/var/log/nhc.log LOGFILE=/var/log/nhc.log
LOG_LEVEL={{ nhc_log_level }} LOG_LEVEL={{ nhc_log_level }}
CONFFILE="{{ nhc_dir }}/etc/nhc/{{ nhc_config_file }}" CONFFILE="{{ nhc_dir }}/etc/nhc/{{ nhc_config_file }}"
NHC_EMAIL_TO={{ nhc_emails }} NHC_EMAIL_TO="{{ nhc_emails }}"
NHC_EMAIL_SUBJECT={{ nhc_email_subject }} NHC_EMAIL_SUBJECT="{{ nhc_email_subject }}"
NHC_LOOP_TIME="300" NHC_LOOP_TIME="300"
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment