From 85967ef5d54f6efbc7ff2f2e9d5126d8197cf43b Mon Sep 17 00:00:00 2001 From: Silvino Silva Date: Sat, 14 Jan 2017 10:08:58 +0000 Subject: clean url in gitweb --- tools/conf/etc/gitweb.conf | 24 ++++--- .../etc/nginx/sites-enabled/git.localhost.conf | 31 +++++++++ tools/conf/srv/gitolite/.gitolite.rc | 2 +- tools/conf/srv/gitolite/gitolite.conf | 80 ++++++++++++++++++++++ 4 files changed, 127 insertions(+), 10 deletions(-) create mode 100644 tools/conf/etc/nginx/sites-enabled/git.localhost.conf create mode 100644 tools/conf/srv/gitolite/gitolite.conf (limited to 'tools') diff --git a/tools/conf/etc/gitweb.conf b/tools/conf/etc/gitweb.conf index b7bd004..26034fb 100644 --- a/tools/conf/etc/gitweb.conf +++ b/tools/conf/etc/gitweb.conf @@ -1,16 +1,22 @@ -our $git_temp = "/srv/www/gitweb_tmp"; - -our $projects_list = "/srv/gitolite/projects.list"; # The directories where your projects are. Must not end with a slash. our $projectroot = "/srv/gitolite/repositories"; # Base URLs for links displayed in the web interface. our @git_base_url_list = qw(git://core.privat-network.com http://git@core.private-network.com); +our $site_name = "gitweb"; +our $git_temp = "/srv/www/gitweb_tmp"; + +our $projects_list = "/srv/gitolite/projects.list"; + our $projects_list_group_categories = 1; -# By default, gitweb will happily let people browse any repository -# they guess the name of. This may or may not be what you want. -# I prefer to set these, to allow exactly the repositories in -# projects.list to be browsed. -$export_ok = ""; -$strict_export = "true"; + +our $home_link_str="GitWeb"; + +$feature{'highlight'}{'default'} = [1]; + +$feature{'pathinfo'}{'default'} = [1]; + +our @extra_breadcrumbs = ( + [ 'HomePage' => 'https://core.privat-network.net/' ], +); diff --git a/tools/conf/etc/nginx/sites-enabled/git.localhost.conf b/tools/conf/etc/nginx/sites-enabled/git.localhost.conf new file mode 100644 index 0000000..0cef2b1 --- /dev/null +++ b/tools/conf/etc/nginx/sites-enabled/git.localhost.conf @@ -0,0 +1,31 @@ +server { + listen 443 ssl; + + server_name git.localhost git.c9.core git.core.privat-network.net; + + root /srv/www/gitweb; + +# location / { +# index gitweb.cgi; +# } + +# location /gitweb.cgi { +# include fastcgi_params; +# gzip off; +# fastcgi_param SCRIPT_FILENAME /srv/www/gitweb/gitweb.cgi; +# fastcgi_param GITWEB_CONFIG /etc/gitweb.conf; +# fastcgi_pass unix:/var/run/fcgiwrap.sock; +# } + + location / { + index gitweb.cgi + fastcgi_param GITWEB_CONFIG /etc/gitweb.conf; + fastcgi_param DOCUMENT_ROOT /srv/www/gitweb/; + fastcgi_param SCRIPT_NAME /gitweb.cgi$fastcgi_path_info; + fastcgi_split_path_info ^()(/?.+)$; + + include fastcgi_params; + fastcgi_pass unix:/var/run/fcgiwrap.sock; + } + +} diff --git a/tools/conf/srv/gitolite/.gitolite.rc b/tools/conf/srv/gitolite/.gitolite.rc index e568453..fa18e4e 100644 --- a/tools/conf/srv/gitolite/.gitolite.rc +++ b/tools/conf/srv/gitolite/.gitolite.rc @@ -155,7 +155,7 @@ # 'partial-copy', # manage local, gitolite-controlled, copies of read-only upstream repos - # 'upstream', + 'upstream', # updates 'description' file instead of 'gitweb.description' config item # 'cgit', diff --git a/tools/conf/srv/gitolite/gitolite.conf b/tools/conf/srv/gitolite/gitolite.conf new file mode 100644 index 0000000..09133ec --- /dev/null +++ b/tools/conf/srv/gitolite/gitolite.conf @@ -0,0 +1,80 @@ +@guests = gitweb +@interns = silvino +@dev = silvino +@teamleads = silvino +@staff = @interns @dev @teamleads + +repo @secret + - = @guests + option deny-rules = 1 + +repo @floss + RW+ = @dev @staff + R = @all + +repo @project + RW+ = @teamleads + - master = @dev + - refs/tags/v[0-9] = @dev + RW+ develop/ = @dev + RW+ feature/ = @dev + RW+ hot-fix/ = @dev + RW = @dev + R = @interns + +repo @mirror + RW+ release/ = @teamleads + RW+ develop/ = @dev + RW+ feature/ = @dev + RW+ hot-fix/ = @dev + R = @all + +repo gitolite-admin + RW+ = gitolite + +repo c9-doc c9-ports c9-pmwiki c9-assistant + config gitweb.owner = "c9 team" + config gitweb.category = "c9" + +repo linux-pck + config gitweb.owner = "c9 team" + config gitweb.category = "mirrors" + +repo opt core contrib + config gitweb.owner = "crux" + config gitweb.category = "crux" + +repo c9-doc + config gitweb.description = "c9 documentation" + option hook.post-receive = deploy-web-doc + +repo c9-ports + config gitweb.description = "c9 ports" + +repo c9-pmwiki + config gitweb.description = "c9 wiki" + option hook.post-receive = deploy-web-doc + +repo c9-assistant + config gitweb.owner = "c9 team" + config gitweb.description = "c9 open assistant" + +repo core + config gitweb.description = "crux core collection" + +repo opt + config gitweb.description = "crux opt collection" + +repo contrib + config gitweb.description = "crux contrib collection" + +repo linux-pck + config gitweb.description = "PCK or Parabola Community Kernel are multiple patches, pf-kernel and zen-kernel for Linux-libre kernel" + option upstream.url = git://git.parabola.nu/pck.git + option upstream.nice = 120 + + +@secret = gitolite-admin +@project = c9-doc c9-ports c9-pmwiki c9-assistant +@project = core opt contrib +@mirror = linux-pck -- cgit 1.4.1-2-gfad0