Remove the template-path and git-update-hook options which are no longer used. Update the git_clone_uri_anon default value. Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org> --- conf/config.proto | 4 +--- git-interface/git-serve.py | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/conf/config.proto b/conf/config.proto index 7c56a2b..94ef8e6 100644 --- a/conf/config.proto +++ b/conf/config.proto @@ -19,7 +19,7 @@ max_filesize_uncompressed = 8388608 disable_http_login = 1 aur_location = https://aur.archlinux.org cgit_uri = https://aur.archlinux.org/cgit/aur.git -git_clone_uri_anon = https://aur.archlinux.org/cgit/%s.git/ +git_clone_uri_anon = https://aur.archlinux.org/%s.git/ git_clone_uri_priv = ssh+git://aur@aur.archlinux.org/%s.git/ max_rpc_results = 5000 aur_request_ml = aur-requests@archlinux.org @@ -36,8 +36,6 @@ ssh-options = no-port-forwarding,no-X11-forwarding,no-pty [serve] repo-path = /srv/http/aurweb/aur.git/ repo-regex = [a-z0-9][a-z0-9.+_-]*$ -template-path = /srv/http/aurweb/git-interface/templates/ -git-update-hook = /srv/http/aurweb/git-interface/git-update.py git-shell-cmd = /usr/bin/git-shell ssh-cmdline = ssh aur@aur.archlinux.org diff --git a/git-interface/git-serve.py b/git-interface/git-serve.py index fce766a..5aa44c3 100755 --- a/git-interface/git-serve.py +++ b/git-interface/git-serve.py @@ -21,7 +21,6 @@ repo_path = config.get('serve', 'repo-path') repo_regex = config.get('serve', 'repo-regex') git_shell_cmd = config.get('serve', 'git-shell-cmd') ssh_cmdline = config.get('serve', 'ssh-cmdline') -template_path = config.get('serve', 'template-path') def pkgbase_exists(pkgbase): db = mysql.connector.connect(host=aur_db_host, user=aur_db_user, -- 2.4.2