[sysadmin-bin] Drop additional git.gnome.org references
- From: Andrea Veri <averi src gnome org>
- To: gnome-sysadmin gnome org,commits-list gnome org
- Subject: [sysadmin-bin] Drop additional git.gnome.org references
- Date: Tue, 29 May 2018 19:48:40 +0000 (UTC)
commit 6eddd95a10ed8a5b446feac256e6dce3c355d75f
Author: Andrea Veri <averi redhat com>
Date: Tue May 29 21:48:08 2018 +0200
Drop additional git.gnome.org references
cleanup-inactive-ldap-accounts.py | 2 +-
git/post-receive-mirror-github | 9 ++-------
git/post-receive-notify-ostree | 2 +-
git/post-receive-notify-updates | 2 +-
git/post-receive-update-description | 5 -----
git/pre-receive-check-policy | 2 +-
mail/set-topics-svn-commits-list | 16 +---------------
7 files changed, 7 insertions(+), 31 deletions(-)
---
diff --git a/cleanup-inactive-ldap-accounts.py b/cleanup-inactive-ldap-accounts.py
index 320d9f3..b970386 100755
--- a/cleanup-inactive-ldap-accounts.py
+++ b/cleanup-inactive-ldap-accounts.py
@@ -29,7 +29,7 @@ parser.add_option("--verbose",
(options, args) = parser.parse_args()
if socket.gethostname() != 'gitlab.gnome.org':
- print ("You are not allowed to run this script on a different host than git.gnome.org, exiting...",
end='\n')
+ print ("You are not allowed to run this script on a different host than gitlab.gnome.org, exiting...",
end='\n')
sys.exit(1)
repositories = filter( lambda f: not f.endswith('wiki.git'), os.listdir(GL_PATH))
diff --git a/git/post-receive-mirror-github b/git/post-receive-mirror-github
index de37822..9d3488c 100755
--- a/git/post-receive-mirror-github
+++ b/git/post-receive-mirror-github
@@ -39,7 +39,6 @@ import smtplib
from email.mime.text import MIMEText
import tempfile
import json
-import socket
ORGANIZATION="GNOME"
name_maps = {"gtk+": "gtk",
@@ -47,7 +46,7 @@ name_maps = {"gtk+": "gtk",
class GitHub:
def __init__ (self):
- allowed_paths = ['/var/opt/gitlab/git-data/repositories/GNOME', '/git']
+ allowed_paths = ['/var/opt/gitlab/git-data/repositories/GNOME']
if os.path.dirname(os.getcwd()) not in allowed_paths:
sys.exit(1)
@@ -108,11 +107,7 @@ def get_repo_settings (repo_name):
nss = {'doap': 'http://usefulinc.com/ns/doap#',
'rdf': 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'}
- hostname = socket.gethostname()
- if hostname == 'gitlab.gnome.org':
- doap_url = 'https://%s/GNOME/%s/raw/master/%s.doap' % (hostname, repo_name, repo_name)
- else:
- doap_url = "https://git.gnome.org/browse/%s/plain/%s.doap" % (repo_name, repo_name)
+ doap_url = 'https://%s/GNOME/%s/raw/master/%s.doap' % (hostname, repo_name, repo_name)
rq = requests.get(doap_url)
if rq.status_code not in (200, 301, 302):
diff --git a/git/post-receive-notify-ostree b/git/post-receive-notify-ostree
index d24ce17..7cad077 100755
--- a/git/post-receive-notify-ostree
+++ b/git/post-receive-notify-ostree
@@ -37,7 +37,7 @@ sys.path.insert(0, script_dir)
from git import *
def main():
- allowed_paths = ['/var/opt/gitlab/git-data/repositories/GNOME', '/git']
+ allowed_paths = ['/var/opt/gitlab/git-data/repositories/GNOME']
if os.path.dirname(os.getcwd()) not in allowed_paths:
sys.exit(1)
diff --git a/git/post-receive-notify-updates b/git/post-receive-notify-updates
index 9ec1e8a..3d0e5a4 100755
--- a/git/post-receive-notify-updates
+++ b/git/post-receive-notify-updates
@@ -96,7 +96,7 @@ def main():
print >>out, s("""
To: %(recipients)s
-From: nobody git gnome org
+From: nobody gitlab gnome org
Subject: %(subject)s
""") % {
'recipients': ", ".join(recipients),
diff --git a/git/post-receive-update-description b/git/post-receive-update-description
index 6d78bd9..604707a 100755
--- a/git/post-receive-update-description
+++ b/git/post-receive-update-description
@@ -20,11 +20,6 @@ update_info_from_doap() {
fi
git cat-file blob "$newrev:$path" | $BINDIR/extract-doap-info $GIT_DIR
- if [ $(hostname) == 'git.gnome.org' ]; then
- $BINDIR/update-cgit
- else
- :
- fi
}
update_info() {
diff --git a/git/pre-receive-check-policy b/git/pre-receive-check-policy
index 8ce2e47..6013c6a 100755
--- a/git/pre-receive-check-policy
+++ b/git/pre-receive-check-policy
@@ -10,7 +10,7 @@
# would set an environment variable that this script would interpret.
# Used in some of the messages
-server=git.gnome.org
+server=gitlab.gnome.org
GIT_DIR=$(git rev-parse --git-dir 2>/dev/null)
diff --git a/mail/set-topics-svn-commits-list b/mail/set-topics-svn-commits-list
index 0c23fae..81f4d8a 100755
--- a/mail/set-topics-svn-commits-list
+++ b/mail/set-topics-svn-commits-list
@@ -42,21 +42,7 @@ def get_gitlab_gnome_org_modules():
return list(set(modules))
-def get_git_gnome_org_modules():
- f = urllib.urlopen("http://git.gnome.org/repositories.txt")
-
- # Ensure the URL is sane (readable and plain text)
- if f.headers.getmaintype() != 'text' or f.headers.status != "":
- sys.exit(1)
-
- modules = f.read()
- f.close()
-
- modules = modules.strip()
- return modules.split("\n")
-
-modules = get_gitlab_gnome_org_modules() + get_git_gnome_org_modules()
-modules.sort()
+modules = get_gitlab_gnome_org_modules().sort()
# Prepare topics variable
topics = [(module, "^%s$" % re.escape(module), '', 0) for module in modules]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]