From 861aade5e9fa67641ea212c8170fc6ef5aa2f29a Mon Sep 17 00:00:00 2001
From: eric o meehan <eric@eom.dev>
Date: Tue, 6 Aug 2024 11:45:36 -0400
Subject: [PATCH] v0.0.4

---
 files/httpd-gitweb.conf      |  1 +
 files/httpd-ssi.conf         |  7 +++++++
 files/mime.types             |  2 +-
 tasks/www.yaml               |  2 ++
 templates/httpd-auth.conf.j2 | 13 +++++++++++++
 5 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 files/httpd-ssi.conf

diff --git a/files/httpd-gitweb.conf b/files/httpd-gitweb.conf
index d27367e..2c4299b 100644
--- a/files/httpd-gitweb.conf
+++ b/files/httpd-gitweb.conf
@@ -3,6 +3,7 @@ LoadModule cgi_module modules/mod_cgi.so
 
 SetEnv GIT_PROJECT_ROOT /usr/local/apache2/htdocs
 SetEnv GIT_HTTP_EXPORT_ALL
+
 ScriptAliasMatch \
 	"(?x)^/(.*/(HEAD | \
 			info/refs | \
diff --git a/files/httpd-ssi.conf b/files/httpd-ssi.conf
new file mode 100644
index 0000000..cef7522
--- /dev/null
+++ b/files/httpd-ssi.conf
@@ -0,0 +1,7 @@
+LoadModule include_module modules/mod_include.so
+
+AddOutputFilter INCLUDES .shtml
+
+<Directory "/usr/local/apache2/htdocs">
+    Options +Includes
+</Directory>
diff --git a/files/mime.types b/files/mime.types
index 8c74143..350c167 100644
--- a/files/mime.types
+++ b/files/mime.types
@@ -1688,7 +1688,7 @@ text/csv					csv
 # text/example
 # text/fwdred
 # text/grammar-ref-list
-text/html					html htm
+text/html					html htm shtml
 text/javascript					js mjs
 # text/jcr-cnd
 text/markdown					md
diff --git a/tasks/www.yaml b/tasks/www.yaml
index 735c43e..4ee59ad 100644
--- a/tasks/www.yaml
+++ b/tasks/www.yaml
@@ -5,6 +5,7 @@
     httpd_server_name: "www.eom.dev"
     httpd_conf_extra:
       - httpd-auth.conf
+      - httpd-ssi.conf
   k8s:
     state: present
     api_version: v1
@@ -15,6 +16,7 @@
       data:
         httpd.conf: "{{ lookup('template', 'httpd.conf.j2') }}"
         httpd-auth.conf: "{{ lookup('template', 'httpd-auth.conf.j2') }}"
+        httpd-ssi.conf: "{{ lookup('file', 'httpd-ssi.conf') }}"
         mime.types: "{{ lookup('file', 'mime.types') }}"
 
 - name: Create a deployment
diff --git a/templates/httpd-auth.conf.j2 b/templates/httpd-auth.conf.j2
index ffd094e..8137de8 100644
--- a/templates/httpd-auth.conf.j2
+++ b/templates/httpd-auth.conf.j2
@@ -1,6 +1,7 @@
 LoadModule authnz_ldap_module modules/mod_authnz_ldap.so
 LoadModule ldap_module modules/mod_ldap.so
 
+# Base
 <LocationMatch "^/">
 	AuthType basic
 	AuthName OpenLDAP
@@ -14,6 +15,7 @@ LoadModule ldap_module modules/mod_ldap.so
 	</RequireAny>
 </LocationMatch>
 
+# Users
 <LocationMatch "^/eric">
 	AuthType basic
 	AuthName OpenLDAP
@@ -23,3 +25,14 @@ LoadModule ldap_module modules/mod_ldap.so
 	AuthLDAPURL "ldap://openldap/dc=eom,dc=dev?uid??(uid=eric)"
 	Require valid-user
 </LocationMatch>
+
+# Git
+<LocationMatch "^/.*/git-receive-pack$">
+	AuthType basic
+	AuthName OpenLDAP
+	AuthBasicProvider ldap
+	AuthLDAPBindDN "cn=admin,dc=eom,dc=dev"
+	AuthLDAPBindPassword "{{ ldap_admin_password }}"
+	AuthLDAPURL "ldap://openldap/dc=eom,dc=dev?uid"
+	Require valid-user
+</LocationMatch>