fix(jans-linux-setup): start jans-auth after backend (#3975)

JanssenProject · Feb 23, 2023 · 4afbcee · 4afbcee
1 parent 81cc059
commit 4afbcee
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 7 deletions.
diff --git a/jans-linux-setup/jans_setup/setup_app/config.py b/jans-linux-setup/jans_setup/setup_app/config.py
@@ -84,8 +84,9 @@ def init(self, install_dir=INSTALL_DIR):
         self.jetty_user = self.jetty_group = 'jetty'
         self.root_user = self.root_group = 'root'
         self.ldap_user = self.ldap_group = 'ldap'
-
+        self.start_auth_after = 'network.target'
         self.dump_config_on_error = False
+
         if not self.output_dir:
             self.output_dir = os.path.join(install_dir, 'output')
 

diff --git a/jans-linux-setup/jans_setup/setup_app/installers/base.py b/jans-linux-setup/jans_setup/setup_app/installers/base.py
@@ -25,6 +25,8 @@ def start_installation(self):
             pbar_text = self.pbar_text
         self.logIt(pbar_text, pbar=self.service_name)
 
+        self.pre_install()
+
         if self.needdb:
             self.dbUtils.bind()
 
@@ -35,10 +37,11 @@ def start_installation(self):
 
         self.create_folders()
 
-        # copy unit file
-        unit_file = os.path.join(Config.staticFolder, 'system/systemd', self.service_name + '.service')
+        # render unit file
+        unit_files_dir = os.path.join(Config.staticFolder, 'system/systemd')
+        unit_file = os.path.join(unit_files_dir, self.service_name + '.service')
         if os.path.exists(unit_file):
-            self.copyFile(unit_file, Config.unit_files_path)
+            self.renderTemplateInOut(unit_file, unit_files_dir, Config.unit_files_path)
 
         self.install()
         self.copy_static()
@@ -160,6 +163,10 @@ def reload_daemon(self, service=None):
             elif base.os_name == 'ubuntu16':
                 self.run([paths.cmd_update_rc, service, 'defaults'])
 
+    def pre_install(self):
+        """Installer may require some settings before installation"""
+        pass
+
     def generate_configuration(self):
         pass
 

diff --git a/jans-linux-setup/jans_setup/setup_app/installers/couchbase.py b/jans-linux-setup/jans_setup/setup_app/installers/couchbase.py
@@ -94,7 +94,7 @@ def install(self):
 
     def couchbaseInstall(self):
         coucbase_package = None
-
+        Config.start_auth_after = 'couchbase-server.service'
         cb_package_list = glob.glob(os.path.join(self.couchbasePackageFolder, 'couchbase-server-enterprise*'))
 
         if not cb_package_list:
@@ -103,7 +103,7 @@ def couchbaseInstall(self):
 
         package_name = max(cb_package_list)
         self.logIt("Found package '%s' for install" % package_name)
-        Config.pbar.progress(self.service_name, "Importing Couchbase package", incr=False)
+        Config.pbar.progress(self.service_name, "Installing Couchbase package", incr=False)
         if base.clone_type == 'deb':
             apt_path = shutil.which('apt')
             self.chown(self.couchbasePackageFolder, '_apt', 'nogroup', recursive=True)

diff --git a/jans-linux-setup/jans_setup/setup_app/installers/opendj.py b/jans-linux-setup/jans_setup/setup_app/installers/opendj.py
@@ -116,6 +116,8 @@ def create_user(self):
     def install_opendj(self):
         self.logIt("Running OpenDJ Setup")
 
+        Config.start_auth_after = 'opendj.service'
+
         # Copy opendj-setup.properties so user ldap can find it in /opt/opendj
         setup_props_fn = os.path.join(Config.ldap_base_dir, 'opendj-setup.properties')
         shutil.copy("%s/opendj-setup.properties" % Config.output_dir, setup_props_fn)

diff --git a/jans-linux-setup/jans_setup/setup_app/installers/rdbm.py b/jans-linux-setup/jans_setup/setup_app/installers/rdbm.py
@@ -100,10 +100,16 @@ def local_install(self):
                     self.restart('mariadb')
                     self.fix_unit_file('mariadb')
                     self.enable('mariadb')
+                    Config.start_auth_after = 'mariadb.service'
 
                 elif base.clone_type == 'rpm':
                     self.restart('mysqld')
                     self.enable('mysqld')
+                    Config.start_auth_after = 'mysqld.service'
+
+                else:
+                    Config.start_auth_after = 'mysql.service'
+
                 result, conn = self.dbUtils.mysqlconnection(log=False)
                 if not result:
                     sql_cmd_list = [
@@ -117,8 +123,10 @@ def local_install(self):
             elif Config.rdbm_type == 'pgsql':
                 if base.clone_type == 'rpm':
                     self.run(['postgresql-setup', 'initdb'])
+                    Config.start_auth_after = 'postgresql.service'
                 elif base.clone_type == 'deb':
                     self.run([paths.cmd_chmod, '640', '/etc/ssl/private/ssl-cert-snakeoil.key'])
+                    Config.start_auth_after = 'postgresql.service'
 
                 self.restart('postgresql')
 

diff --git a/jans-linux-setup/jans_setup/static/system/systemd/jans-auth.service b/jans-linux-setup/jans_setup/static/system/systemd/jans-auth.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Janssen Auth Server
-After=opendj.service
+After=%(start_auth_after)s
 
 [Service]
 Type=forking