Commit 10ecd398 authored by Lukas Fleischer's avatar Lukas Fleischer
Browse files

Restructure scripts



* Move scripts/git-integration/ to git-interface/.
* Move scripts/aurblup/aurblup.py to scripts/aurblup.py.

Signed-off-by: Lukas Fleischer's avatarLukas Fleischer <lfleischer@archlinux.org>
parent 451e60d9
......@@ -28,12 +28,12 @@ Setup on Arch Linux
# mkdir /srv/http/aurweb/aur.git/
# cd /srv/http/aurweb/aur.git/
# git init --bare
# ln -s ../../scripts/git-integration/git-update.py hooks/update
# ln -s ../../git-interface/git-update.py hooks/update
# chown -R aur .
7) Install the git-auth wrapper script:
# cd /srv/http/aurweb/scripts/git-integration/
# cd /srv/http/aurweb/git-interface/
# cp git-auth.sh /usr/local/bin/aur-git-auth
# chmod 755 /usr/local/bin/aur-git-auth
......
......@@ -30,18 +30,18 @@ auto_delete_age = 86400
[auth]
valid-keytypes = ssh-rsa ssh-dss ecdsa-sha2-nistp256 ecdsa-sha2-nistp384 ecdsa-sha2-nistp521 ssh-ed25519
username-regex = [a-zA-Z0-9]+[.\-_]?[a-zA-Z0-9]+$
git-serve-cmd = /srv/http/aurweb/scripts/git-integration/git-serve.py
git-serve-cmd = /srv/http/aurweb/git-interface/git-serve.py
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/scripts/git-integration/templates/
git-update-hook = /srv/http/aurweb/scripts/git-integration/git-update.py
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
[aurblup]
db-path = /srv/http/aurweb/scripts/aurblup/
db-path = /srv/http/aurweb/aurblup/
sync-dbs = core extra community multilib testing community-testing
servers = ftp://mirrors.kernel.org/archlinux/%s/os/x86_64
......@@ -7,7 +7,7 @@ import re
import sys
config = configparser.RawConfigParser()
config.read(os.path.dirname(os.path.realpath(__file__)) + "/../../conf/config")
config.read(os.path.dirname(os.path.realpath(__file__)) + "/../conf/config")
aur_db_host = config.get('database', 'host')
aur_db_name = config.get('database', 'name')
......
#!/bin/sh
/srv/http/aurweb/git-interface/git-auth.py "$1" "$2"
......@@ -9,7 +9,7 @@ import shlex
import sys
config = configparser.RawConfigParser()
config.read(os.path.dirname(os.path.realpath(__file__)) + "/../../conf/config")
config.read(os.path.dirname(os.path.realpath(__file__)) + "/../conf/config")
aur_db_host = config.get('database', 'host')
aur_db_name = config.get('database', 'name')
......
......@@ -11,7 +11,7 @@ import sys
import aurinfo
config = configparser.RawConfigParser()
config.read(os.path.dirname(os.path.realpath(__file__)) + "/../../conf/config")
config.read(os.path.dirname(os.path.realpath(__file__)) + "/../conf/config")
aur_db_host = config.get('database', 'host')
aur_db_name = config.get('database', 'name')
......
#!/bin/sh
/srv/http/aurweb/scripts/git-integration/git-auth.py "$1" "$2"
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment