summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Fleischer <lfleischer@archlinux.org>2015-06-02 15:16:08 +0200
committerLukas Fleischer <lfleischer@archlinux.org>2015-06-02 15:16:24 +0200
commitc38f95f63221d23b109042b32b4eb94b40b25d2c (patch)
tree8e334731649e58dca4d98db8492731ca8dc15941
parent6fe87925089ef16eb8f378d105c4707895dd6e29 (diff)
downloadaur-c38f95f63221d23b109042b32b4eb94b40b25d2c.tar.gz
aur-c38f95f63221d23b109042b32b4eb94b40b25d2c.tar.xz
config.proto: Cleanup
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>
-rw-r--r--conf/config.proto4
-rwxr-xr-xgit-interface/git-serve.py1
2 files changed, 1 insertions, 4 deletions
diff --git a/conf/config.proto b/conf/config.proto
index 7c56a2b4..94ef8e61 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 fce766a8..5aa44c30 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,