diff options
| author |   Robby Workman <rworkman@slackbuilds.org> | 2013-11-24 20:17:01 -0600 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2013-11-25 14:08:19 -0600 |
| commit | 1d048cb81c1eaeac61ee151bb9fa2458870024c3 (patch) | |
| tree | fb682c80bea61fcfacadab41aba49f24def32dd3 /development/cgit/config | |
| parent | 2d46d325edead9a0adefc8f508377be0c8a00436 (diff) | |
| download | slackbuilds-1d048cb81c1eaeac61ee151bb9fa2458870024c3.tar.gz slackbuilds-1d048cb81c1eaeac61ee151bb9fa2458870024c3.tar.xz | |
development/cgit: Fixes for httpd-2.4.x and allow custom DOCROOT
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'development/cgit/config')
| -rw-r--r-- | development/cgit/config/cgit-httpd.conf | 15 | ||||
| -rw-r--r-- | development/cgit/config/cgit-lighttpd.conf | 6 | ||||
| -rw-r--r-- | development/cgit/config/cgit.conf | 2 |
3 files changed, 11 insertions, 12 deletions
diff --git a/development/cgit/config/cgit-httpd.conf b/development/cgit/config/cgit-httpd.conf index a579174fd0..4d713503be 100644 --- a/development/cgit/config/cgit-httpd.conf +++ b/development/cgit/config/cgit-httpd.conf @@ -8,18 +8,17 @@ # # AddHandler cgi-script .cgi -<Directory /var/www/cgi-bin> +<Directory @DOCROOT@/cgi-bin> AllowOverride None - Order allow,deny - Allow from all + Require all granted </Directory> ## Version 1 (default): under /cgi-bin/cgit.cgi address -#ScriptAlias /cgi-bin/cgit.cgi /var/www/cgi-bin/cgit.cgi -#Alias /cgit/ /var/www/cgi-bin/ +#ScriptAlias /cgi-bin/cgit.cgi @DOCROOT@/cgi-bin/cgit.cgi +#Alias /cgit/ @DOCROOT@/cgi-bin/ #<Location /cgit/cgit.cgi> # Options FollowSymlinks ExecCGI -# Allow from All +# Require all granted #</Location> #RewriteEngine on #RewriteCond %{REQUEST_FILENAME} !-f @@ -32,10 +31,10 @@ SetEnv CGIT_CONFIG /etc/cgitrc Options FollowSymlinks ExecCGI DirectoryIndex cgit.cgi - DocumentRoot /var/www/cgi-bin + DocumentRoot @DOCROOT@/cgi-bin <Location /> Options ExecCGI - Allow from All + Require all granted </Location> RewriteEngine on RewriteCond %{REQUEST_FILENAME} !-f diff --git a/development/cgit/config/cgit-lighttpd.conf b/development/cgit/config/cgit-lighttpd.conf index fc49e5763f..ce7ccced54 100644 --- a/development/cgit/config/cgit-lighttpd.conf +++ b/development/cgit/config/cgit-lighttpd.conf @@ -6,15 +6,15 @@ $HTTP["host"] == "cgit.my.domain" { alias.url = ( - "/static/" => "/var/www/cgi-bin/", - "/cgit.cgi" => "/var/www/cgi-bin/cgit.cgi", + "/static/" => "@DOCROOT@/cgi-bin/", + "/cgit.cgi" => "@DOCROOT@/cgi-bin/cgit.cgi", ) url.rewrite-once = ( "^/static/.*$" => "$0", "^/([^?/]+/[^?]*)?(?:\?(.*))?$" => "/cgit.cgi?url=$1&$2", ) cgi.assign = ( - "/var/www/cgi-bin/cgit.cgi" => "", + "@DOCROOT@/cgi-bin/cgit.cgi" => "", ) } diff --git a/development/cgit/config/cgit.conf b/development/cgit/config/cgit.conf index 615c7efe97..a569414191 100644 --- a/development/cgit/config/cgit.conf +++ b/development/cgit/config/cgit.conf @@ -1,2 +1,2 @@ -CGIT_SCRIPT_PATH = /var/www/cgi-bin +CGIT_SCRIPT_PATH = @DOCROOT@/cgi-bin CACHE_ROOT = /var/cache/cgit |