summaryrefslogtreecommitdiff
path: root/etc/httpd
diff options
context:
space:
mode:
Diffstat (limited to 'etc/httpd')
-rw-r--r--etc/httpd/conf/httpd.conf40
1 files changed, 30 insertions, 10 deletions
diff --git a/etc/httpd/conf/httpd.conf b/etc/httpd/conf/httpd.conf
index d99bd92..3b6da71 100644
--- a/etc/httpd/conf/httpd.conf
+++ b/etc/httpd/conf/httpd.conf
@@ -1,20 +1,35 @@
-##
-## Apache Server Configuration
-##
+#
+#
+# Apache Server Configuration
ServerRoot /etc/httpd
#
-# Load Standard Modules
+# Load Modules
LoadModule authz_core_module modules/mod_authz_core.so
LoadModule unixd_module modules/mod_unixd.so
LoadModule log_config_module modules/mod_log_config.so
LoadModule logio_module modules/mod_logio.so
LoadModule mime_magic_module modules/mod_mime_magic.so
LoadModule mime_module modules/mod_mime.so
-LoadModule mpm_prefork_module modules/mod_mpm_prefork.so
-LoadModule cgi_module modules/mod_cgi.so
LoadModule dir_module modules/mod_dir.so
+LoadModule rewrite_module modules/mod_rewrite.so
+LoadModule alias_module modules/mod_alias.so
+LoadModule mpm_prefork_module modules/mod_mpm_prefork.so
+
+# Load CGI Module
+<IfModule !mpm_prefork_module>
+ LoadModule cgid_module modules/mod_cgid.so
+</IfModule>
+<IfModule mpm_prefork_module>
+ LoadModule cgi_module modules/mod_cgi.so
+</IfModule>
+
+# And Basic Auth Modules
+LoadModule auth_basic_module modules/mod_auth_basic.so
+LoadModule authn_core_module modules/mod_authn_core.so
+LoadModule authn_file_module modules/mod_authn_file.so
+LoadModule authz_user_module modules/mod_authz_user.so
#
# Server config
@@ -25,21 +40,26 @@ EnableSendFile on
AddDefaultCharset UTF-8
TypesConfig /etc/mime.types
MIMEMagicFile conf/magic
+AddHandler cgi-script .cgi
+# Always wear protection.
<Directory />
Require all denied
</Directory>
-DocumentRoot "/srv/www/htdocs/cgit"
+# NOTE: Alias matcher MUST end in /, not /cgit.cgi. It WILL break otherwise.
+# ALSO: "cgitrc must have a virtual-root=/".
+# Remove /cgit.cgi/ from url paths.
+ScriptAlias "/" "/srv/www/htdocs/cgit/cgit.cgi/"
<Directory "/srv/www/htdocs/cgit/">
DirectoryIndex cgit.cgi
- AddHandler cgi-script .cgi
AllowOverride None
- Options +ExecCGI -FollowSymLinks
+ Options +ExecCGI +FollowSymLinks
+ SetHandler cgi-script
Require all granted
</Directory>
-# Future proof
+# Deny access to .htaccess/.htpasswd
<Files ".ht">
Require all denied
</Files> \ No newline at end of file