fix(jans-linux-setup): service install check for jetty 10 (#911)

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

@@ -220,7 +220,7 @@ def copy_static(self):
 
     def installed(self):
         return None
-    
+
     def check_need_for_download(self):
         pass
 

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

@@ -68,9 +68,6 @@ def install(self):
 
         self.enable()
 
-    def installed(self):
-        return os.path.exists(os.path.join(Config.jetty_base, self.service_name, 'start.ini'))
-
 
     def create_folders(self):
         for d in (self.output_folder, self.custom_config_dir):

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

@@ -60,7 +60,3 @@ def render_import_templates(self):
 
     def create_folders(self):
         pass
-
-
-    def installed(self):
-        return os.path.exists(os.path.join(Config.jetty_base, self.service_name, 'start.ini'))

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

@@ -87,6 +87,3 @@ def copy_static(self):
             self.run([paths.cmd_mkdir, '-p', target_dir])
             self.copyFile(apple_weauthn, target_dir)
 
-
-    def installed(self):
-        return os.path.exists(os.path.join(Config.jetty_base, self.service_name, 'start.ini'))

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

@@ -157,6 +157,3 @@ def import_openbanking_key(self):
         if os.path.isfile(Config.ob_key_fn) and os.path.isfile(Config.ob_cert_fn):
             self.gen_keystore('obsigning', self.oxauth_openid_jks_fn, Config.oxauth_openid_jks_pass, Config.ob_key_fn, Config.ob_cert_fn, Config.ob_alias)
 
-
-    def installed(self):
-        return os.path.exists(os.path.join(Config.jetty_base, self.service_name, 'start.ini'))

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

@@ -382,3 +382,6 @@ def add_extra_class(self, class_path, xml_fn=None):
                 f.write(b'<?xml version="1.0"  encoding="ISO-8859-1"?>\n')
                 f.write(b'<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">\n')
                 f.write(ET.tostring(root, method='xml'))
+
+    def installed(self):
+        return os.path.exists(os.path.join(Config.jetty_base, self.service_name, 'start.ini')) or os.path.exists(os.path.join(Config.jetty_base, self.service_name, 'start.d/server.ini'))

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

@@ -46,9 +46,6 @@ def install(self):
         self.war_for_jetty10(os.path.join(jettyServiceWebapps, os.path.basename(self.source_files[0][0])))
         self.enable()
 
-    def installed(self):
-        return os.path.exists(os.path.join(Config.jetty_base, self.service_name, 'start.ini'))
-
 
     def create_scope(self, scope, inum_base='0001.'):
         result = self.check_scope(scope['jansId'][0])