From: Simo Sorce Date: Tue, 18 Mar 2014 21:18:53 +0000 (-0400) Subject: Add hostname configuration option X-Git-Tag: v0.2.2~69 X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fipsilon.git;a=commitdiff_plain;h=92d1e2131ecf37b0c6a67376abfe949afb4daed7 Add hostname configuration option Signed-off-by: Simo Sorce --- diff --git a/ipsilon/install/server.py b/ipsilon/install/server.py index 7d198a6..70b3caa 100755 --- a/ipsilon/install/server.py +++ b/ipsilon/install/server.py @@ -24,6 +24,7 @@ import cherrypy import logging import os import shutil +import socket import sys import time @@ -126,6 +127,8 @@ def parse_args(plugins): action='version', version='%(prog)s 0.1') parser.add_argument('-o', '--login-managers-order', dest='lm_order', help='Comma separated list of login managers') + parser.add_argument('--hostname', + help="Machine's fully qualified host name") parser.add_argument('--ipa', choices=['yes', 'no'], default='yes', help='Detect and use an IPA server for authentication') parser.add_argument('--uninstall', action='store_true', @@ -143,6 +146,12 @@ def parse_args(plugins): args = vars(parser.parse_args()) + if not args['hostname']: + args['hostname'] = socket.getfqdn() + + if len(args['hostname'].split('.')) < 2: + raise ConfigurationError('Hostname: %s is not a FQDN') + if args['lm_order'] is None: args['lm_order'] = [] for name in lms: