From ba4da49423faaf49500f1b3366909e404f7862ff Mon Sep 17 00:00:00 2001
From: Malfurious <m@lfurio.us>
Date: Fri, 15 Sep 2023 13:03:34 -0400
Subject: cgit: Consolidate config files into a single directory

Continue cleaning the folder structure from the previous merge.

Signed-off-by: Malfurious <m@lfurio.us>
---
 cgit/httpd.conf | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 cgit/httpd.conf

(limited to 'cgit/httpd.conf')

diff --git a/cgit/httpd.conf b/cgit/httpd.conf
new file mode 100644
index 0000000..50f88aa
--- /dev/null
+++ b/cgit/httpd.conf
@@ -0,0 +1,35 @@
+# https://httpd.apache.org/docs/current/
+# https://httpd.apache.org/docs/current/mod/directives.html
+
+LoadModule alias_module modules/mod_alias.so
+LoadModule authz_core_module modules/mod_authz_core.so
+LoadModule cgid_module modules/mod_cgid.so
+LoadModule mpm_event_module modules/mod_mpm_event.so
+LoadModule unixd_module modules/mod_unixd.so
+
+ServerRoot "/etc/httpd"
+ServerAdmin webmaster@example.com
+ServerName localhost
+Listen 80
+User http
+Group http
+
+ErrorLog "/var/log/httpd/error_log"
+LogLevel warn
+
+<Directory "/">
+    AllowOverride None
+    Require all denied
+</Directory>
+
+<Directory "/usr/share/webapps/cgit/">
+    AllowOverride None
+    Options ExecCGI FollowSymlinks
+    Require all granted
+</Directory>
+
+Alias /cgit.css "/usr/share/webapps/cgit/cgit.css"
+Alias /cgit.png "/usr/share/webapps/cgit/cgit.png"
+Alias /favicon.ico "/usr/share/webapps/cgit/favicon.ico"
+
+ScriptAlias / "/usr/share/webapps/cgit/cgit.cgi/"
-- 
cgit v1.2.3


From 8d112c09f0dd433a55bca9c477dd307f5aeaac3a Mon Sep 17 00:00:00 2001
From: Malfurious <m@lfurio.us>
Date: Sat, 16 Sep 2023 06:32:15 -0400
Subject: cgit: Update user and file paths for alpine distro

Signed-off-by: Malfurious <m@lfurio.us>
---
 cgit/httpd.conf | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'cgit/httpd.conf')

diff --git a/cgit/httpd.conf b/cgit/httpd.conf
index 50f88aa..e8ee772 100644
--- a/cgit/httpd.conf
+++ b/cgit/httpd.conf
@@ -1,20 +1,20 @@
 # https://httpd.apache.org/docs/current/
 # https://httpd.apache.org/docs/current/mod/directives.html
 
-LoadModule alias_module modules/mod_alias.so
-LoadModule authz_core_module modules/mod_authz_core.so
-LoadModule cgid_module modules/mod_cgid.so
-LoadModule mpm_event_module modules/mod_mpm_event.so
-LoadModule unixd_module modules/mod_unixd.so
+LoadModule alias_module /usr/lib/apache2/mod_alias.so
+LoadModule authz_core_module /usr/lib/apache2/mod_authz_core.so
+LoadModule cgid_module /usr/lib/apache2/mod_cgid.so
+LoadModule mpm_event_module /usr/lib/apache2/mod_mpm_event.so
+LoadModule unixd_module /usr/lib/apache2/mod_unixd.so
 
-ServerRoot "/etc/httpd"
+ServerRoot "/etc/apache2"
 ServerAdmin webmaster@example.com
 ServerName localhost
 Listen 80
-User http
-Group http
+User apache
+Group apache
 
-ErrorLog "/var/log/httpd/error_log"
+ErrorLog "/var/log/apache2/error_log"
 LogLevel warn
 
 <Directory "/">
-- 
cgit v1.2.3