From 35415d20c836c06b47831210a940c2274329c3a1 Mon Sep 17 00:00:00 2001
From: Bram Prieshof <bram@bprieshof.nl>
Date: Sun, 2 Jul 2023 20:21:31 +0200
Subject: [PATCH] Update references to new git location

---
 MySQL-ModInst.sh     | 6 +++---
 Update-PhpMyAdmin.sh | 6 +++---
 conf.sh              | 6 +++---
 mysql-8.0.sh         | 6 +++---
 preconf.sh           | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/MySQL-ModInst.sh b/MySQL-ModInst.sh
index 8b61f13..18ceda2 100644
--- a/MySQL-ModInst.sh
+++ b/MySQL-ModInst.sh
@@ -60,8 +60,8 @@ unset dist_ver dist APTMODE
 
 
 #Repo Vars
-repo=https://git.ictmaatwerk.com/VPS-scripts/MySQL
-branch=master
+repo=https://git.bprieshof.nl/Work_Archive/VPS-scripts_MySQL
+mbranch=main
 
 ###Select Module type
 mtype=""$repo"/raw/branch/"$branch""
@@ -88,7 +88,7 @@ fi
 
 msg "Starting installer." 8 78
 $PKGI curl > $OUTPUT 2>&1
-curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=init osrel=$shortdist bash > $OUTPUT 2>&1
+curl --retry 7 --retry-delay 5 -s https://git.bprieshof.nl/Work/PKGRepoSetup/raw/branch/Main/Setup-Repo.sh  |repo=init osrel=$shortdist bash > $OUTPUT 2>&1
 
 
 ##-------------------------##
diff --git a/Update-PhpMyAdmin.sh b/Update-PhpMyAdmin.sh
index eddc66f..6fc1231 100644
--- a/Update-PhpMyAdmin.sh
+++ b/Update-PhpMyAdmin.sh
@@ -1,14 +1,14 @@
 #!/bin/bash
 
 #MySQL GIT repo Settings
-mrepo=https://git.ictmaatwerk.com/VPS-scripts/MySQL
-mbranch=master
+mrepo=https://git.bprieshof.nl/Work_Archive/VPS-scripts_MySQL
+mbranch=main
 
 #Removing old version
 rm -rf /usr/share/phpmyadmin/*
 
 #Installing new verion
-curl --retry 7 --retry-delay 5 -s http://mirror.nxdi.nl/resources/phpmyadmin/phpMyAdmin-latest-english.tar.gz -o /tmp/phpmya.tar.gz
+curl --retry 7 --retry-delay 5 -s https://www.phpmyadmin.net/downloads/phpMyAdmin-latest-english.tar.gz -o /tmp/phpmya.tar.gz
 tar -C /usr/share/phpmyadmin -xzf /tmp/phpmya.tar.gz --strip 1
 
 #Installing custom vendor config
diff --git a/conf.sh b/conf.sh
index 87e1b6e..f8b9a65 100644
--- a/conf.sh
+++ b/conf.sh
@@ -1,6 +1,6 @@
 ###Fetch Config
-mrepo=https://git.ictmaatwerk.com/VPS-scripts/MySQL
-mbranch=master
+mrepo=https://git.bprieshof.nl/Work_Archive/VPS-scripts_MySQL
+mbranch=main
 
 if [ -z ${password+x} ]; then echo 'Error $password is not set' > $OUTPUT 2>&1 ; fi
 if [ -z ${PHPMyadmin+x} ]; then echo 'Error $PHPMyadmin is not set, Setting default OFF' > $OUTPUT 2>&1 && PHPMyadmin=0;fi #check if Var is set
@@ -31,7 +31,7 @@ if [ $PHPMyadmin = 1 ]; then
   mkdir -p /etc/phpmyadmin
   mkdir -p /var/log/PhpMyAdmin
   mkdir -p /var/lib/phpmyadmin/tmp/
-  curl --retry 7 --retry-delay 5 -s http://mirror.nxdi.nl/resources/phpmyadmin/phpMyAdmin-latest-english.tar.gz -o /tmp/phpmya.tar.gz
+  curl --retry 7 --retry-delay 5 -s https://www.phpmyadmin.net/downloads/phpMyAdmin-latest-english.tar.gz -o /tmp/phpmya.tar.gz
   tar -C /usr/share/phpmyadmin -xzf /tmp/phpmya.tar.gz --strip 1
 
 
diff --git a/mysql-8.0.sh b/mysql-8.0.sh
index 55b77a9..d8c9bdb 100644
--- a/mysql-8.0.sh
+++ b/mysql-8.0.sh
@@ -60,8 +60,8 @@ unset dist_ver dist APTMODE
 
 
 #Repo Vars
-mrepo=https://git.ictmaatwerk.com/VPS-scripts/MySQL
-mbranch=master
+mrepo=https://git.bprieshof.nl/Work_Archive/VPS-scripts_MySQL
+mbranch=main
 
 ###Select Module type
 mtype=""$mrepo"/raw/branch/"$mbranch""
@@ -86,7 +86,7 @@ echo "$1"
 
 msg "Starting installer." 8 78
 $PKGI curl > $OUTPUT 2>&1
-curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=init osrel=$shortdist bash > $OUTPUT 2>&1
+curl --retry 7 --retry-delay 5 -s https://git.bprieshof.nl/Work/PKGRepoSetup/raw/branch/Main/Setup-Repo.sh  |repo=init osrel=$shortdist bash > $OUTPUT 2>&1
 
 
 
diff --git a/preconf.sh b/preconf.sh
index 5fef8b2..68b86ab 100644
--- a/preconf.sh
+++ b/preconf.sh
@@ -1,5 +1,5 @@
-mrepo=https://git.ictmaatwerk.com/VPS-scripts/MySQL
-mbranch=master
+mrepo=https://git.bprieshof.nl/Work_Archive/VPS-scripts_MySQL
+mbranch=main
 if [ -z ${password+x} ]; then echo 'Error $password is not set'; fi
 
 if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist" = "deb10" ] || [ "$shortdist" = "deb11" ] ; then
@@ -13,7 +13,7 @@ if [ "$shortdist" = "ubu1804" ] || [ "$shortdist" = "ubu2004" ] || [ "$shortdist
     if [ -z ${CurDebFrond+x} ]; then unset DEBIAN_FRONTEND ; else export DEBIAN_FRONTEND=$CurDebFrond; fi #Restore DEBIAN_FRONTEND
 fi
 
-curl --retry 7 --retry-delay 5 -s https://git.ictmaatwerk.com/VPS-scripts/General/raw/branch/Main/Setup-Repo.sh |repo=mysql osrel=$shortdist bash
+curl --retry 7 --retry-delay 5 -s https://git.bprieshof.nl/Work/PKGRepoSetup/raw/branch/Main/Setup-Repo.sh |repo=mysql osrel=$shortdist bash
 
 unset mrepo
 unset mbranch
\ No newline at end of file