From 45a302ee73f8976e677d7d08722ae8b8599a7da0 Mon Sep 17 00:00:00 2001 From: Zachary T Welch Date: Tue, 27 Oct 2009 19:48:44 -0700 Subject: [PATCH] apache.conf: generate using config.pl --- .gitignore | 1 + apache.conf | 19 ------------------- apache.conf.in | 19 +++++++++++++++++++ config.pl | 3 +++ 4 files changed, 23 insertions(+), 19 deletions(-) delete mode 100644 apache.conf create mode 100644 apache.conf.in diff --git a/.gitignore b/.gitignore index 83866f9..0daec33 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ config.txt cgi/Git/RepoCGI/Config.pm gitweb_config.perl +apache.conf diff --git a/apache.conf b/apache.conf deleted file mode 100644 index 27a2f34..0000000 --- a/apache.conf +++ /dev/null @@ -1,19 +0,0 @@ - - ServerName repo.or.cz - ServerAlias www.repo.or.cz - ServerAdmin pasky@suse.cz - - ErrorLog /var/log/apache2/repo-error.log - CustomLog /var/log/apache2/repo-access.log combined - - DocumentRoot /home/pasky/WWW/repo - - Options Indexes FollowSymLinks MultiViews ExecCGI - AllowOverride All - Order allow,deny - allow from all - DirectoryIndex gitweb.cgi - - - ScriptAlias /w /home/pasky/WWW/repo/gitweb.cgi - diff --git a/apache.conf.in b/apache.conf.in new file mode 100644 index 0000000..62200e2 --- /dev/null +++ b/apache.conf.in @@ -0,0 +1,19 @@ + + ServerName @site_domain@ + ServerAlias www.@site_domain@ + ServerAdmin @site_admin@ + + ErrorLog @log_path@/repo-error.log + CustomLog @log_path@/repo-access.log combined + + DocumentRoot @web_path@ + + Options Indexes FollowSymLinks MultiViews ExecCGI + AllowOverride All + Order allow,deny + allow from all + DirectoryIndex gitweb.cgi + + + ScriptAlias /w @web_path@/gitweb.cgi + diff --git a/config.pl b/config.pl index 2df132d..da907ce 100755 --- a/config.pl +++ b/config.pl @@ -8,6 +8,9 @@ my @config = ( site_admin => 'pasky@ucw.cz', site_domain => 'repo.or.cz', + web_path => "$home_path/www", + log_path => "/var/log/apache2", + bin_path => "$home_path/bin", jail_path => "$home_path/jail", repomgr_path => "$home_path/repomgr", -- 2.11.4.GIT