fix: post install tasks

GluuFederation · Jul 7, 2021 · 3f00142 · 3f00142
1 parent 915ef29
commit 3f00142
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/setup.py b/setup.py
@@ -349,6 +349,8 @@ def do_installation():
             base.logIt("Loading test data")
             testDataLoader.load_test_data()
 
+        gluuInstaller.post_install_tasks()
+
         for service in gluuProgress.services:
             if service['app_type'] == static.AppType.SERVICE:
                 gluuProgress.progress(PostSetup.service_name, "Starting {}".format(service['name'].title()))
@@ -359,8 +361,6 @@ def do_installation():
                     gluuProgress.progress(PostSetup.service_name, "Starting Oxauth-rp")
                     service['object'].start('oxauth-rp')
 
-        gluuInstaller.post_install_tasks()
-
         gluuProgress.progress(static.COMPLETED)
 
         if not GSA:

diff --git a/setup_app/installers/gluu.py b/setup_app/installers/gluu.py
@@ -137,7 +137,6 @@ def makeFolders(self):
 
         if not base.snap:
             self.run([paths.cmd_chown, '-R', 'root:gluu', Config.certFolder])
-            self.run([paths.cmd_chown, '-R', 'root:gluu', Config.gluuOptPythonFolder])
             self.run([paths.cmd_chmod, '551', Config.certFolder])
             self.run([paths.cmd_chmod, 'ga+w', "/tmp"]) # Allow write to /tmp
 
@@ -420,6 +419,7 @@ def post_install_tasks(self):
             self.run([paths.cmd_chown, '-R', 'jetty:root', Config.certFolder])
             self.run([paths.cmd_chmod, '-R', '660', Config.certFolder])
             self.run([paths.cmd_chmod, 'u+X', Config.certFolder])
+            self.run([paths.cmd_chown, '-R', 'root:gluu', Config.gluuOptPythonFolder])
 
             if not Config.installed_instance:
                 cron_service = 'crond' if base.clone_type == 'rpm' else 'cron'