fix: jans-linux-setup openbanking setup issues

JanssenProject · Apr 30, 2022 · 3837dd2 · 3837dd2
1 parent 2c2ad3a
commit 3837dd2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/jans-linux-setup/jans_setup/jans_setup.py b/jans-linux-setup/jans_setup/jans_setup.py
@@ -108,9 +108,9 @@ def ami_packaged():
 from setup_app.installers.jetty import JettyInstaller
 from setup_app.installers.jython import JythonInstaller
 from setup_app.installers.jans_auth import JansAuthInstaller
+from setup_app.installers.opendj import OpenDjInstaller
 
 if Config.profile == 'jans':
-    from setup_app.installers.opendj import OpenDjInstaller
     from setup_app.installers.couchbase import CouchbaseInstaller
     from setup_app.installers.scim import ScimInstaller
     from setup_app.installers.fido import FidoInstaller

diff --git a/jans-linux-setup/jans_setup/openbanking/setup_app/config.py b/jans-linux-setup/jans_setup/openbanking/setup_app/config.py
@@ -25,6 +25,7 @@ class Config:
     osDefault = '/etc/default'
     sysemProfile = '/etc/profile'
     jython_home = '/opt/jython'
+    ldapBaseFolder = '/opt/opendj'
     network = '/etc/sysconfig/network'
     jetty_home = '/opt/jetty'
     jetty_base = os.path.join(jansOptFolder, 'jetty')
@@ -67,6 +68,8 @@ def init(self, install_dir=INSTALL_DIR):
             self.app_info['SETUP_BRANCH'] = 'main'
 
         self.ox_version = self.app_info['JANS_APP_VERSION'] + self.app_info['JANS_BUILD']
+        self.data_dir = os.path.join(self.install_dir, 'setup_app/data')
+        self.ldapBinFolder = os.path.join(self.ldapBaseFolder, 'bin')
 
         self.thread_queue = None
         self.jetty_user = 'jetty'

diff --git a/jans-linux-setup/jans_setup/openbanking/setup_app/utils/arg_parser.py b/jans-linux-setup/jans_setup/openbanking/setup_app/utils/arg_parser.py
@@ -50,6 +50,12 @@
 parser.add_argument('-static-kid', help="Openbanking static kid")
 parser.add_argument('-jwks-uri', help="Openbanking jwksUri", default="https://keystore.openbankingtest.org.uk/0014H00001lFE7dQAG/axV5umCvTMBMjPwjFQgEvb.jwks")
 
+parser.add_argument('--force-download', help="Force downloading files", action='store_true')
+parser.add_argument('--download-exit', help="Download files and exits", action='store_true')
+parser.add_argument('-jans-app-version', help="Version for Jannses applications")
+parser.add_argument('-jans-build', help="Buid version for Janssen applications")
+parser.add_argument('-setup-branch', help="Jannsen setup github branch", default='main')
+
 
 def add_to_me(you):