From 0f74b3de1ef8af57f70dfad42204c300e018bd6b Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 31 Aug 2017 16:06:37 +0200 Subject: [PATCH] Make repo url configurable / move to new url for tests --- config/config | 2 +- config/nginx.conf | 2 +- config/sources.list | 4 ++-- init.sh | 3 +++ scripts/build_deb | 2 +- scripts/rebuildd/upload-binaries | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/config/config b/config/config index 8c56ac3..d87c37b 100644 --- a/config/config +++ b/config/config @@ -6,7 +6,7 @@ DEBSIGN_KEYID=59A3E6FF DEBFULLNAME="YunoHost Contributors" DEBEMAIL="contrib@yunohost.org" MAIL="rebuildd@yunohost.org" -REPO_URL="repo.yunohost.org" +REPO_URL="vinaigrette.yunohost.org" # Codenames, components and architectures diff --git a/config/nginx.conf b/config/nginx.conf index b6e7fa0..7827323 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -1,7 +1,7 @@ server { listen 80; listen [::]:80; - server_name repo.yunohost.org; + server_name __REPO_URL__; location '/.well-known/acme-challenge' { default_type "text/plain"; diff --git a/config/sources.list b/config/sources.list index 69ff4f7..9a542f1 100644 --- a/config/sources.list +++ b/config/sources.list @@ -1,2 +1,2 @@ -deb-src http://repo.yunohost.org/debian jessie stable testing unstable extra -deb-src http://repo.yunohost.org/debian stretch stable testing unstable extra +deb-src http://__REPO_URL__/debian jessie stable testing unstable extra +deb-src http://__REPO_URL__/debian stretch stable testing unstable extra diff --git a/init.sh b/init.sh index 693fa94..2950a79 100755 --- a/init.sh +++ b/init.sh @@ -35,6 +35,9 @@ cp $VINAIGRETTE_HOME/config/nginx.conf /etc/nginx/sites-enabled/repo.conf cat $VINAIGRETTE_HOME/config/keys/$DEBSIGN_KEYID.pub | apt-key add cat $VINAIGRETTE_HOME/config/sources.list > /etc/apt/sources.list.d/vinaigrette.list +sed -i "s/__REPO_URL__/$REPO_URL/g" > /etc/nginx/sites-enabled/repo.conf +sed -i "s/__REPO_URL__/$REPO_URL/g" > /etc/apt/sources.list.d/vinaigrette.list + echo "127.0.0.1 $REPO_URL" >> /etc/hosts service nginx reload diff --git a/scripts/build_deb b/scripts/build_deb index 3aab281..a5c9c24 100755 --- a/scripts/build_deb +++ b/scripts/build_deb @@ -115,4 +115,4 @@ fi # exit 1 #fi -echo "Build will start soon. See http://rebuild.yunohost.org" +echo "Build will start soon. See http://$REPO_URL" diff --git a/scripts/rebuildd/upload-binaries b/scripts/rebuildd/upload-binaries index b62618c..c904bcb 100755 --- a/scripts/rebuildd/upload-binaries +++ b/scripts/rebuildd/upload-binaries @@ -92,7 +92,7 @@ fi export HOME=$HOME_PBUILDER -xmpp_msg="[rebuildd] Completed build of ${package}/${version} in ${COMPONENT} for ${CODENAME}/${arch}. See http://rebuild.yunohost.org/job/${job}" +xmpp_msg="[rebuildd] Completed build of ${package}/${version} in ${COMPONENT} for ${CODENAME}/${arch}. See http://$REPO_URL/job/${job}" echo -n "$xmpp_msg" \ | sendxmpp -u gitbot -j im.yunohost.org -p "$XMPP_BOT_KEY" \