summaryrefslogtreecommitdiffstats
path: root/ipsilon/install
diff options
context:
space:
mode:
authorSimo Sorce <simo@redhat.com>2014-05-01 21:00:14 -0400
committerSimo Sorce <simo@redhat.com>2014-05-01 21:05:47 -0400
commitf139821010d71a07e011b257132b4acbc872a21b (patch)
treedbaa3474c175ae312be5c4650fb306308d9d9916 /ipsilon/install
parentc6e97e93a61b02602f14606a60b6154880308123 (diff)
downloadipsilon-f139821010d71a07e011b257132b4acbc872a21b.tar.gz
ipsilon-f139821010d71a07e011b257132b4acbc872a21b.tar.xz
ipsilon-f139821010d71a07e011b257132b4acbc872a21b.zip
Always use saml by default
Signed-off-by: Simo Sorce <simo@redhat.com>
Diffstat (limited to 'ipsilon/install')
-rwxr-xr-xipsilon/install/ipsilon-client-install10
1 files changed, 5 insertions, 5 deletions
diff --git a/ipsilon/install/ipsilon-client-install b/ipsilon/install/ipsilon-client-install
index 9255289..d48df1b 100755
--- a/ipsilon/install/ipsilon-client-install
+++ b/ipsilon/install/ipsilon-client-install
@@ -78,7 +78,7 @@ def saml2():
raise
path = None
- if args['saml_httpd']:
+ if not args['saml_no_httpd']:
path = os.path.join(SAML2_HTTPDIR, args['hostname'])
os.makedirs(path, 0750)
else:
@@ -100,7 +100,7 @@ def saml2():
sp_metafile = os.path.join(path, 'metadata.xml')
m.output(sp_metafile)
- if args['saml_httpd']:
+ if not args['saml_no_httpd']:
idp_metafile = os.path.join(path, 'idp-metadata.xml')
with open(idp_metafile, 'w+') as f:
f.write(idpmeta)
@@ -184,12 +184,12 @@ def parse_args():
help="Account allowed to create a SP")
parser.add_argument('--httpd-user', default='apache',
help="Web server account used to read certs")
- parser.add_argument('--saml', action='store_true', default=False,
+ parser.add_argument('--saml', action='store_true', default=True,
help="Whether to install a saml2 SP")
parser.add_argument('--saml-idp-metadata', default=None,
help="A URL pointing at the IDP Metadata (FILE or HTTP)")
- parser.add_argument('--saml-httpd', action='store_true', default=False,
- help="Automatically configure httpd")
+ parser.add_argument('--saml-no-httpd', action='store_true', default=False,
+ help="Do not configure httpd")
parser.add_argument('--saml-base', default='/',
help="Where saml2 authdata is available")
parser.add_argument('--saml-auth', default=SAML2_PROTECTED,