From 7767b5e717a3fd11f7ff54fbec7ad11d6e9df8aa Mon Sep 17 00:00:00 2001
From: Mustafa Baser <mbaser@mail.com>
Date: Sat, 29 Jan 2022 22:38:08 +0300
Subject: [PATCH] fix: linux-setup suse httpd configuration (#734)

---
 .../setup_app/installers/httpd.py             | 27 +++++++++----------
 jans-linux-setup/templates/apache/httpd.conf  |  6 ++---
 .../templates/apache/https_jans.conf          |  4 +--
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/jans-linux-setup/setup_app/installers/httpd.py b/jans-linux-setup/setup_app/installers/httpd.py
index a4af7414ac2..bf12c476b31 100644
--- a/jans-linux-setup/setup_app/installers/httpd.py
+++ b/jans-linux-setup/setup_app/installers/httpd.py
@@ -27,6 +27,7 @@ def __init__(self):
         self.httpdKeyFn = os.path.join(Config.certFolder, 'httpd.key')
         self.httpdCertFn = os.path.join(Config.certFolder, 'httpd.crt')
 
+
         self.templates_folder = os.path.join(Config.templateFolder, 'apache')
         self.output_folder = os.path.join(Config.outputFolder, 'apache')
 
@@ -35,13 +36,21 @@ def __init__(self):
         self.apache2_24_conf = os.path.join(self.output_folder, 'httpd_2.4.conf')
         self.apache2_ssl_24_conf = os.path.join(self.output_folder, 'https_jans.conf')
 
+        self.server_root = '/var/www/html'
+
         if base.os_type == 'suse':
             self.https_jans_fn = '/etc/apache2/vhosts.d/_https_jans.conf'
+            self.server_root = '/srv/www/htdocs'
+            self.apache_user = 'wwwrun'
+            self.apache_group = 'wwwrun'
         elif base.clone_type == 'rpm':
             self.https_jans_fn = '/etc/httpd/conf.d/https_jans.conf'
+            self.apache_user = 'apache'
+            self.apache_group = 'apache'
         else:
             self.https_jans_fn = '/etc/apache2/sites-available/https_jans.conf'
-
+            self.apache_user = 'www-data'
+            self.apache_group = 'www-data'
 
     def configure(self):
         self.logIt(self.pbar_text, pbar=self.service_name)
@@ -49,7 +58,7 @@ def configure(self):
 
         self.write_httpd_config()
 
-        self.writeFile('/var/www/html/index.html', 'OK')
+        self.writeFile(os.path.join(self.server_root, 'index.html'), 'OK')
 
         if base.snap:
             icons_conf_fn = '/etc/apache2/mods-available/alias.conf'
@@ -72,10 +81,10 @@ def configure(self):
         error_templates = glob.glob(os.path.join(self.templates_folder,'error_pages/*.html'))
 
         for tmp_fn in error_templates:
-            self.copyFile(tmp_fn, '/var/www/html')
+            self.copyFile(tmp_fn, self.server_root)
 
         # we only need these modules
-        mods_enabled = ['env', 'log_config', 'proxy', 'proxy_http', 'access_compat', 'alias', 'authn_core', 'authz_core', 'authz_host', 'headers', 'mime', 'mpm_event', 'proxy_ajp', 'security2', 'reqtimeout', 'setenvif', 'socache_shmcb', 'ssl', 'unique_id', 'rewrite']
+        mods_enabled = ['env', 'log_config', 'proxy', 'proxy_http', 'access_compat', 'alias', 'authn_core', 'authz_core', 'authz_host', 'headers', 'mime', 'mpm_event', 'proxy_ajp', 'security2', 'reqtimeout', 'setenvif', 'socache_shmcb', 'ssl', 'unique_id', 'rewrite', 'mod_dir']
 
         cmd_a2enmod = shutil.which('a2enmod')
         cmd_a2dismod = shutil.which('a2dismod')
@@ -123,16 +132,6 @@ def configure(self):
             cmd_a2enflag = shutil.which('a2enflag')
             self.run([cmd_a2enflag, 'SSL'])
 
-            httpd_conf_fn = '/etc/apache2/httpd.conf'
-            httpd_conf_txt = self.readFile(httpd_conf_fn)
-            httpd_conf = httpd_conf_txt.splitlines()
-
-            for i, l in enumerate(httpd_conf[:]):
-                if l.strip().startswith('DirectoryIndex'):
-                    httpd_conf[i] = l.replace('DirectoryIndex', '#DirectoryIndex')
-
-            self.writeFile(httpd_conf_fn, '\n'.join(httpd_conf))
-
         else:
             modules_config_dir = '/etc/apache2/sysconfig.d' if base.os_type == 'suse' else '/etc/httpd/conf.modules.d'
             for mod_load_fn in glob.glob(os.path.join(modules_config_dir,'*')):
diff --git a/jans-linux-setup/templates/apache/httpd.conf b/jans-linux-setup/templates/apache/httpd.conf
index 34800fb4ae3..305e2d210a8 100644
--- a/jans-linux-setup/templates/apache/httpd.conf
+++ b/jans-linux-setup/templates/apache/httpd.conf
@@ -14,8 +14,8 @@ KeepAlive Off
 MaxKeepAliveRequests 100
 KeepAliveTimeout 15
 
-Alias /error/ "/var/www/error/"
-Alias /icons/ "/var/www/icons/"
+Alias /error/ "%(server_root)s/error/"
+Alias /icons/ "%(server_root)s/icons/"
 
 UseCanonicalName On
 TypesConfig /etc/mime.types
@@ -72,7 +72,7 @@ LogFormat "%{Referer}i -> %U" referer
 LogFormat "%{User-agent}i" agent
 CustomLog logs/access_log combined
 
-<Directory "/var/www/icons">
+<Directory "%(server_root)s/icons">
     Options -Indexes MultiViews
     AllowOverride None
     Order allow,deny
diff --git a/jans-linux-setup/templates/apache/https_jans.conf b/jans-linux-setup/templates/apache/https_jans.conf
index 49003ab6a61..db93208e43a 100644
--- a/jans-linux-setup/templates/apache/https_jans.conf
+++ b/jans-linux-setup/templates/apache/https_jans.conf
@@ -1,11 +1,11 @@
 <VirtualHost  *:80>
     ServerName %(hostname)s
     Redirect  / https://%(hostname)s/
-    DocumentRoot "/var/www/html/"
+    DocumentRoot "%(server_root)s"
 </VirtualHost>
 
 <VirtualHost *:443>
-    DocumentRoot "/var/www/html/"
+    DocumentRoot "%(server_root)s"
     ServerName %(hostname)s:443
 
     LogLevel warn