summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/git-integration/git-auth.py3
-rwxr-xr-xscripts/git-integration/git-serve.py6
-rwxr-xr-xscripts/git-integration/git-update.py3
3 files changed, 8 insertions, 4 deletions
diff --git a/scripts/git-integration/git-auth.py b/scripts/git-integration/git-auth.py
index 8701d5e..801a1d3 100755
--- a/scripts/git-integration/git-auth.py
+++ b/scripts/git-integration/git-auth.py
@@ -12,6 +12,7 @@ aur_db_host = config.get('database', 'host')
aur_db_name = config.get('database', 'name')
aur_db_user = config.get('database', 'user')
aur_db_pass = config.get('database', 'password')
+aur_db_socket = config.get('database', 'socket')
key_prefixes = config.get('auth', 'key-prefixes').split()
username_regex = config.get('auth', 'username-regex')
@@ -25,7 +26,7 @@ if pubkey is None or not pubkey.startswith(valid_prefixes):
db = mysql.connector.connect(host=aur_db_host, user=aur_db_user,
passwd=aur_db_pass, db=aur_db_name,
- buffered=True)
+ unix_socket=aur_db_socket, buffered=True)
cur = db.cursor()
cur.execute("SELECT Username FROM Users WHERE SSHPubKey = %s " +
diff --git a/scripts/git-integration/git-serve.py b/scripts/git-integration/git-serve.py
index e621677..0cad176 100755
--- a/scripts/git-integration/git-serve.py
+++ b/scripts/git-integration/git-serve.py
@@ -15,6 +15,7 @@ aur_db_host = config.get('database', 'host')
aur_db_name = config.get('database', 'name')
aur_db_user = config.get('database', 'user')
aur_db_pass = config.get('database', 'password')
+aur_db_socket = config.get('database', 'socket')
repo_base_path = config.get('serve', 'repo-base')
repo_regex = config.get('serve', 'repo-regex')
@@ -40,7 +41,8 @@ def setup_repo(repo, user):
die('invalid repository name: %s' % (repo))
db = mysql.connector.connect(host=aur_db_host, user=aur_db_user,
- passwd=aur_db_pass, db=aur_db_name)
+ passwd=aur_db_pass, db=aur_db_name,
+ unix_socket=aur_db_socket)
cur = db.cursor()
cur.execute("SELECT COUNT(*) FROM PackageBases WHERE Name = %s ", [repo])
@@ -66,7 +68,7 @@ def setup_repo(repo, user):
def check_permissions(pkgbase, user):
db = mysql.connector.connect(host=aur_db_host, user=aur_db_user,
passwd=aur_db_pass, db=aur_db_name,
- buffered=True)
+ unix_socket=aur_db_socket, buffered=True)
cur = db.cursor()
cur.execute("SELECT COUNT(*) FROM PackageBases INNER JOIN Users " +
diff --git a/scripts/git-integration/git-update.py b/scripts/git-integration/git-update.py
index c20eede..74a55b5 100755
--- a/scripts/git-integration/git-update.py
+++ b/scripts/git-integration/git-update.py
@@ -17,6 +17,7 @@ aur_db_host = config.get('database', 'host')
aur_db_name = config.get('database', 'name')
aur_db_user = config.get('database', 'user')
aur_db_pass = config.get('database', 'password')
+aur_db_socket = config.get('database', 'socket')
def save_srcinfo(srcinfo, db, cur, user):
# Obtain package base ID and previous maintainer.
@@ -206,7 +207,7 @@ srcinfo = aurinfo.ParseAurinfoFromIterable(srcinfo_raw)
db = mysql.connector.connect(host=aur_db_host, user=aur_db_user,
passwd=aur_db_pass, db=aur_db_name,
- buffered=True)
+ unix_socket=aur_db_socket, buffered=True)
cur = db.cursor()
save_srcinfo(srcinfo, db, cur, user)
db.close()