X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fipsilon.git;a=blobdiff_plain;f=ipsilon%2Finstall%2Fipsilon-server-install;h=ce78aba6a5361ad9a0940a2267f0984036cc3420;hp=b5a6371877a8f620513fc9c65197de19584db83e;hb=aaed708431955d4cc01e82f003c9d35851073510;hpb=2c888a62a0c21114b51fd79d5321d5fed39f0b6e

diff --git a/ipsilon/install/ipsilon-server-install b/ipsilon/install/ipsilon-server-install
index b5a6371..ce78aba 100755
--- a/ipsilon/install/ipsilon-server-install
+++ b/ipsilon/install/ipsilon-server-install
@@ -19,6 +19,7 @@
 
 from ipsilon.login.common import LoginMgrsInstall
 from ipsilon.providers.common import ProvidersInstall
+from ipsilon.helpers.common import EnvHelpersInstall
 from ipsilon.util.data import Store
 from ipsilon.tools import files
 import argparse
@@ -28,6 +29,7 @@ import os
 import pwd
 import shutil
 import socket
+import subprocess
 import sys
 import time
 
@@ -124,6 +126,11 @@ def install(plugins, args):
     db = Store()
     db.save_user_preferences(args['admin_user'], {'is_admin': 1})
 
+    logger.info('Configuring environment helpers')
+    for plugin_name in plugins['Environment Helpers']:
+        plugin = plugins['Environment Helpers'][plugin_name]
+        plugin.configure_server(args)
+
     logger.info('Configuring login managers')
     for plugin_name in args['lm_order']:
         plugin = plugins['Login Managers'][plugin_name]
@@ -137,6 +144,10 @@ def install(plugins, args):
     # Fixup permissions so only the ipsilon user can read these files
     files.fix_user_dirs(instance_conf, opts['system_user'], mode=0500)
     files.fix_user_dirs(args['data_dir'], opts['system_user'])
+    try:
+        subprocess.call(['/usr/sbin/restorecon', '-R', args['data_dir']])
+    except Exception:  # pylint: disable=broad-except
+        pass
 
 def uninstall(plugins, args):
     logger.info('Uninstallation initiated')
@@ -145,6 +156,7 @@ def uninstall(plugins, args):
 
 def find_plugins():
     plugins = {
+        'Environment Helpers': EnvHelpersInstall().plugins,
         'Login Managers': LoginMgrsInstall().plugins,
         'Auth Providers': ProvidersInstall().plugins
     }
@@ -165,8 +177,6 @@ def parse_args(plugins):
                         help="User account used to run the server")
     parser.add_argument('--admin-user', default='admin',
                         help="User account that is assigned admin privileges")
-    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',
                         help="Uninstall the server and all data")