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>
---
 .gitignore        |  1 +
 cgit/cgitrc       | 38 ++++++++++++++++++++++++++++++++++++++
 cgit/httpd.conf   | 35 +++++++++++++++++++++++++++++++++++
 docker/.gitignore |  1 -
 docker/cgitrc     | 38 --------------------------------------
 docker/httpd.conf | 35 -----------------------------------
 6 files changed, 74 insertions(+), 74 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 cgit/cgitrc
 create mode 100644 cgit/httpd.conf
 delete mode 100644 docker/.gitignore
 delete mode 100644 docker/cgitrc
 delete mode 100644 docker/httpd.conf

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2fa7496
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.pub
diff --git a/cgit/cgitrc b/cgit/cgitrc
new file mode 100644
index 0000000..6df01d2
--- /dev/null
+++ b/cgit/cgitrc
@@ -0,0 +1,38 @@
+# cgit config
+# see cgitrc(5) for details
+#
+# possible todos: header, footer
+
+css=/cgit.css
+logo=/cgit.png
+logo-link=/
+
+root-title=NormalMode.org Repositories
+root-desc=Public repositories hosted on normalmode.org
+
+clone-url=https://$HTTP_HOST$SCRIPT_NAME/$CGIT_REPO_URL ssh://gitolite@$HTTP_HOST/$CGIT_REPO_URL
+
+enable-blame=1
+enable-follow-links=1
+enable-git-config=1
+enable-http-clone=1
+enable-index-links=1
+enable-index-owner=1
+enable-log-filecount=1
+enable-log-linecount=1
+enable-tree-linenumbers=1
+
+section-sort=1
+repository-sort=age
+branch-sort=age
+agefile=agefile
+
+max-repo-count=512
+max-stats=year
+
+snapshots=tar.gz zip
+remove-suffix=1
+section-from-path=-1
+strict-export=gl-creator
+
+scan-path=/data/repositories/
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/"
diff --git a/docker/.gitignore b/docker/.gitignore
deleted file mode 100644
index 2fa7496..0000000
--- a/docker/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.pub
diff --git a/docker/cgitrc b/docker/cgitrc
deleted file mode 100644
index 6df01d2..0000000
--- a/docker/cgitrc
+++ /dev/null
@@ -1,38 +0,0 @@
-# cgit config
-# see cgitrc(5) for details
-#
-# possible todos: header, footer
-
-css=/cgit.css
-logo=/cgit.png
-logo-link=/
-
-root-title=NormalMode.org Repositories
-root-desc=Public repositories hosted on normalmode.org
-
-clone-url=https://$HTTP_HOST$SCRIPT_NAME/$CGIT_REPO_URL ssh://gitolite@$HTTP_HOST/$CGIT_REPO_URL
-
-enable-blame=1
-enable-follow-links=1
-enable-git-config=1
-enable-http-clone=1
-enable-index-links=1
-enable-index-owner=1
-enable-log-filecount=1
-enable-log-linecount=1
-enable-tree-linenumbers=1
-
-section-sort=1
-repository-sort=age
-branch-sort=age
-agefile=agefile
-
-max-repo-count=512
-max-stats=year
-
-snapshots=tar.gz zip
-remove-suffix=1
-section-from-path=-1
-strict-export=gl-creator
-
-scan-path=/data/repositories/
diff --git a/docker/httpd.conf b/docker/httpd.conf
deleted file mode 100644
index 50f88aa..0000000
--- a/docker/httpd.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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