Merge pull request #1280 from JanssenProject/jans-linux-setup-mysql-t…

…imezone fix: jans-linux-setup move mysql-timezone to config
JanssenProject · May 3, 2022 · 0a6a3d6 · 0a6a3d6
2 parents 1474b84 + 31df7db
commit 0a6a3d6
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/jans-linux-setup/jans_setup/setup_app/config.py b/jans-linux-setup/jans_setup/setup_app/config.py
@@ -128,6 +128,7 @@ def progress(self, service_name, msg, incr=False):
                                         'oxauthClient_4_inum': 'FF81-2D39',
                                         'idp_attribute_resolver_ldap.search_filter': '(|(uid=$requestContext.principalName)(mail=$requestContext.principalName))',
                                         'oxd_port': '8443',
+                                        'server_time_zone': 'UTC' + time.strftime("%z"),
                                      }
 
         # java commands

diff --git a/jans-linux-setup/jans_setup/setup_app/installers/rdbm.py b/jans-linux-setup/jans_setup/setup_app/installers/rdbm.py
@@ -361,12 +361,8 @@ def import_ldif(self):
 
         self.dbUtils.import_ldif(ldif_files)
 
-    def server_time_zone(self):
-        Config.templateRenderingDict['server_time_zone'] = 'UTC' + time.strftime("%z")
-
     def rdbmProperties(self):
         if Config.rdbm_type in ('sql', 'mysql'):
-            self.server_time_zone()
             Config.rdbm_password_enc = self.obscure(Config.rdbm_password)
             self.renderTemplateInOut(Config.jansRDBMProperties, Config.templateFolder, Config.configFolder)
 

diff --git a/jans-linux-setup/jans_setup/setup_app/test_data_loader.py b/jans-linux-setup/jans_setup/setup_app/test_data_loader.py
@@ -118,7 +118,6 @@ def load_test_data(self):
                 config_oxauth_test_properties += '\n#spanner\n' +  rendered_text
 
             else:
-                base.current_app.RDBMInstaller.server_time_zone()
                 template_text = self.readFile(os.path.join(self.template_base, 'jans-auth/server/config-oxauth-test-sql.properties.nrnd'))
                 rendered_text = self.fomatWithDict(template_text, self.merge_dicts(Config.__dict__, Config.templateRenderingDict))
                 config_oxauth_test_properties += '\n#sql\n' +  rendered_text