fix: linux-setup apache config file name (#719)

JanssenProject · Jan 27, 2022 · 46ce0ae · 46ce0ae
1 parent 3e781b7
commit 46ce0ae
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/jans-linux-setup/setup_app/installers/httpd.py b/jans-linux-setup/setup_app/installers/httpd.py
@@ -36,11 +36,11 @@ def __init__(self):
         self.apache2_ssl_24_conf = os.path.join(self.output_folder, 'https_jans.conf')
 
         if base.os_type == 'suse':
-            self.https_jans_fn = '/etc/apache2/vhosts.d/_https_gluu.conf'
+            self.https_jans_fn = '/etc/apache2/vhosts.d/_https_jans.conf'
         elif base.clone_type == 'rpm':
-            self.https_jans_fn = '/etc/httpd/conf.d/https_gluu.conf'
+            self.https_jans_fn = '/etc/httpd/conf.d/https_jans.conf'
         else:
-            self.https_jans_fn = '/etc/apache2/sites-available/https_gluu.conf'
+            self.https_jans_fn = '/etc/apache2/sites-available/https_jans.conf'
 
 
     def configure(self):
@@ -177,7 +177,7 @@ def write_httpd_config(self):
         # CentOS 7.* + systemd + apache 2.4
         if self.service_name == 'httpd' and self.apache_version == "2.4":
             self.copyFile(self.apache2_24_conf, '/etc/httpd/conf/httpd.conf')
-            self.copyFile(self.apache2_ssl_24_conf, '/etc/httpd/conf.d/https_gluu.conf')
+            self.copyFile(self.apache2_ssl_24_conf, '/etc/httpd/conf.d/https_jans.conf')
 
         if base.os_type == 'suse':
             self.copyFile(self.apache2_ssl_conf, self.https_jans_fn)
@@ -189,7 +189,7 @@ def write_httpd_config(self):
         elif base.clone_type == 'deb':
             self.copyFile(self.apache2_ssl_conf, self.https_jans_fn)
             self.run([paths.cmd_ln, '-s', self.https_jans_fn,
-                      '/etc/apache2/sites-enabled/https_gluu.conf'])
+                      '/etc/apache2/sites-enabled/https_jans.conf'])
 
     def installed(self):
         return os.path.exists(self.https_jans_fn)
diff --git a/jans-linux-setup/setup_app/installers/rdbm.py b/jans-linux-setup/setup_app/installers/rdbm.py
@@ -55,7 +55,8 @@ def local_install(self):
 
             if Config.rdbm_type == 'mysql':
                 if base.os_type == 'suse':
-                    self.restart('mysql')
+                    self.restart('mariadb')
+                    self.enable('mariadb')
                 elif base.clone_type == 'rpm':
                     self.restart('mysqld')
                 result, conn = self.dbUtils.mysqlconnection(log=False)