fix(jans-linux-setup): suse setup issues (#9401)

Signed-off-by: Mustafa Baser <mbaser@mail.com>
Former-commit-id: 3702661

jans-linux-setup/jans_setup/setup_app/installers/jans.py

@@ -153,7 +153,11 @@ def configureSystem(self):
             self.writeHybridProperties()
 
         # set systemd start timeout to 5 mins
-        systemd_conf_fn = '/etc/systemd/system.conf'
+        for sys_prefix in ('/etc', '/usr/lib'):
+            systemd_conf_fn = os.path.join(sys_prefix, 'systemd/system.conf')
+            if os.path.exists(systemd_conf_fn):
+                break
+
         systemd_conf = []
 
         for l in open(systemd_conf_fn):

jans-linux-setup/jans_setup/setup_app/utils/base.py

@@ -193,7 +193,10 @@ def check_resources():
 
 
 def determineApacheVersion(full=False):
-    httpd_cmd = shutil.which(httpd_name) or shutil.which('apache2ctl')
+    for cmd_ in ('apache2', 'httpd', 'apache2ctl'):
+        httpd_cmd = shutil.which(cmd_)
+        if httpd_cmd:
+            break
     cmd = httpd_cmd + " -v | egrep '^Server version'"
     output = run(cmd, shell=True)
     apache_version_re = re.search('Apache/(\d).(\d).(\d)', output.strip())
@@ -328,7 +331,7 @@ def find_script_names(ldif_file):
                 result = rec.search(l)
                 if result:
                     name_list.append(result.groups()[0])
-                
+
     return name_list
 
 def download(url, dst, verbose=False, headers=None):