summaryrefslogtreecommitdiffstats
path: root/ipsilon/providers/saml2idp.py
diff options
context:
space:
mode:
authorSimo Sorce <simo@redhat.com>2014-04-18 00:43:37 -0400
committerSimo Sorce <simo@redhat.com>2014-04-21 00:05:05 -0400
commit0b578c4a5961baf85275a5cbc93676aca61758b5 (patch)
treeaf739afcd18ffbeaa094b9ac8b2716ca6c2794ea /ipsilon/providers/saml2idp.py
parent47ff8363b7961188084f05c55558a166b06decb4 (diff)
downloadipsilon.git-0b578c4a5961baf85275a5cbc93676aca61758b5.tar.gz
ipsilon.git-0b578c4a5961baf85275a5cbc93676aca61758b5.tar.xz
ipsilon.git-0b578c4a5961baf85275a5cbc93676aca61758b5.zip
Make it easy to install mutiple server instances
Signed-off-by: Simo Sorce <simo@redhat.com>
Diffstat (limited to 'ipsilon/providers/saml2idp.py')
-rwxr-xr-xipsilon/providers/saml2idp.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/ipsilon/providers/saml2idp.py b/ipsilon/providers/saml2idp.py
index 0ac2a72..3f3ab87 100755
--- a/ipsilon/providers/saml2idp.py
+++ b/ipsilon/providers/saml2idp.py
@@ -246,16 +246,13 @@ class Installer(object):
def install_args(self, group):
group.add_argument('--saml2', choices=['yes', 'no'], default='yes',
help='Configure SAML2 Provider')
- group.add_argument('--saml2-storage',
- default='/var/lib/ipsilon/saml2',
- help='SAML2 Provider storage area')
def configure(self, opts):
if opts['saml2'] != 'yes':
return
# Check storage path is present or create it
- path = opts['saml2_storage']
+ path = os.path.join(opts['data_dir'], 'saml2')
if not os.path.exists(path):
os.makedirs(path, 0700)
@@ -264,7 +261,7 @@ class Installer(object):
cert.generate('idp', opts['hostname'])
# Generate Idp Metadata
- url = 'https://' + opts['hostname'] + '/idp/saml2'
+ url = 'https://' + opts['hostname'] + '/' + opts['instance'] + '/saml2'
meta = metadata.Metadata(metadata.IDP_ROLE)
meta.set_entity_id(url + '/metadata')
meta.add_certs(cert, cert)