Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Mar 1, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jans-linux-setup/jans_setup/setup_app/installers/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ def copy_static(self):

def installed(self):
return None

def check_need_for_download(self):
pass

Expand Down
3 changes: 0 additions & 3 deletions jans-linux-setup/jans_setup/setup_app/installers/config_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
4 changes: 0 additions & 4 deletions jans-linux-setup/jans_setup/setup_app/installers/eleven.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
3 changes: 0 additions & 3 deletions jans-linux-setup/jans_setup/setup_app/installers/fido.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
3 changes: 0 additions & 3 deletions jans-linux-setup/jans_setup/setup_app/installers/jans_auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
3 changes: 3 additions & 0 deletions jans-linux-setup/jans_setup/setup_app/installers/jetty.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
3 changes: 0 additions & 3 deletions jans-linux-setup/jans_setup/setup_app/installers/scim.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down