CHANGED: re-enabled onion repos for Qubes after downtime

diff --git a/user_salt/common/onionize-repositories/files/fedora-qubes-r4.repo b/user_salt/common/onionize-repositories/files/fedora-qubes-r4.repo
index 4306a6834cb58a78184f0eed5976f771d2469d6a..a1b61ecf5221f1bda3560fe0943a454f87321150 100644 (file)
--- a/user_salt/common/onionize-repositories/files/fedora-qubes-r4.repo
+++ b/user_salt/common/onionize-repositories/files/fedora-qubes-r4.repo
@@ -1,7 +1,7 @@
 [qubes-vm-r4.2-current]
 name = Qubes OS Repository for VM (updates)
-baseurl = https://yum.qubes-os.org/r4.2/current/vm/fc$releasever
-#baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.2/current/vm/fc$releasever
+#baseurl = https://yum.qubes-os.org/r4.2/current/vm/fc$releasever
+baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.2/current/vm/fc$releasever
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4.2-primary
 skip_if_unavailable=False
 gpgcheck = 1
@@ -10,8 +10,8 @@ enabled=1
 
 [qubes-vm-r4.2-current-testing]
 name = Qubes OS Repository for VM (updates-testing)
-baseurl = https://yum.qubes-os.org/r4.2/current-testing/vm/fc$releasever
-#baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.2/current-testing/vm/fc$releasever
+#baseurl = https://yum.qubes-os.org/r4.2/current-testing/vm/fc$releasever
+baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.2/current-testing/vm/fc$releasever
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4.2-primary
 skip_if_unavailable=False
 gpgcheck = 1
@@ -20,8 +20,8 @@ enabled=0
 
 [qubes-vm-r4.2-security-testing]
 name = Qubes OS Repository for VM (security-testing)
-baseurl = https://yum.qubes-os.org/r4.2/security-testing/vm/fc$releasever
-#baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.2/security-testing/vm/fc$releasever
+#baseurl = https://yum.qubes-os.org/r4.2/security-testing/vm/fc$releasever
+baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.2/security-testing/vm/fc$releasever
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4.2-primary
 skip_if_unavailable=False
 gpgcheck = 1
@@ -30,8 +30,8 @@ enabled=0
 
 [qubes-vm-r4.2-unstable]
 name = Qubes OS Repository for VM (unstable)
-baseurl = https://yum.qubes-os.org/r4.2/unstable/vm/fc$releasever
-#baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.2/unstable/vm/fc$releasever
+#baseurl = https://yum.qubes-os.org/r4.2/unstable/vm/fc$releasever
+baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.2/unstable/vm/fc$releasever
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-4.2-unstable
 gpgcheck = 1
 repo_gpgcheck = 1

diff --git a/user_salt/common/onionize-repositories/files/qubes-dom0.repo b/user_salt/common/onionize-repositories/files/qubes-dom0.repo
index 9db8994ce4acf8b9cdc8d04eac0716329d36aa27..a00cbee3d783d47b0d9ed4c5bfad45d5f0ea4916 100644 (file)
--- a/user_salt/common/onionize-repositories/files/qubes-dom0.repo
+++ b/user_salt/common/onionize-repositories/files/qubes-dom0.repo
@@ -1,7 +1,7 @@
 [qubes-dom0-current]
 name = Qubes Host Repository (updates)
-baseurl = https://yum.qubes-os.org/r$releasever/current/host/fc37
-#baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r$releasever/current/host/fc37
+#baseurl = https://yum.qubes-os.org/r$releasever/current/host/fc37
+baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r$releasever/current/host/fc37
 #metalink = https://yum.qubes-os.org/r$releasever/current/host/fc37/repodata/repomd.xml.metalink
 skip_if_unavailable=False
 enabled = 1
@@ -11,8 +11,8 @@ gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-primary
 
 [qubes-dom0-current-testing]
 name = Qubes Host Repository (updates-testing)
-baseurl = https://yum.qubes-os.org/r$releasever/current-testing/host/fc37
-#baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r$releasever/current-testing/host/fc37
+#baseurl = https://yum.qubes-os.org/r$releasever/current-testing/host/fc37
+baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r$releasever/current-testing/host/fc37
 #metalink = https://yum.qubes-os.org/r$releasever/current-testing/host/fc37/repodata/repomd.xml.metalink
 skip_if_unavailable=False
 enabled = 0
@@ -22,8 +22,8 @@ gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-primary
 
 [qubes-dom0-security-testing]
 name = Qubes Host Repository (security-testing)
-baseurl = https://yum.qubes-os.org/r$releasever/security-testing/host/fc37
-#baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r$releasever/security-testing/host/fc37
+#baseurl = https://yum.qubes-os.org/r$releasever/security-testing/host/fc37
+baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r$releasever/security-testing/host/fc37
 #metalink = https://yum.qubes-os.org/r$releasever/security-testing/host/fc37/repodata/repomd.xml.metalink
 skip_if_unavailable=False
 enabled = 0
@@ -33,8 +33,8 @@ gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-primary
 
 [qubes-dom0-unstable]
 name = Qubes Host Repository (unstable)
-baseurl = https://yum.qubes-os.org/r$releasever/unstable/host/fc37
-#baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r$releasever/unstable/host/fc37
+#baseurl = https://yum.qubes-os.org/r$releasever/unstable/host/fc37
+baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r$releasever/unstable/host/fc37
 #metalink = https://yum.qubes-os.org/r$releasever/unstable/host/fc37/repodata/repomd.xml.metalink
 skip_if_unavailable=False
 enabled = 0

diff --git a/user_salt/common/onionize-repositories/files/qubes-r4.list b/user_salt/common/onionize-repositories/files/qubes-r4.list
index 3e571a74cc6cabbf0882284b805a75f5ed7193c0..f9fa01bcd5f396c9a3716a97f604ba00ac226691 100644 (file)
--- a/user_salt/common/onionize-repositories/files/qubes-r4.list
+++ b/user_salt/common/onionize-repositories/files/qubes-r4.list
@@ -1,5 +1,5 @@
 # Main qubes updates repository
-deb [arch=amd64 signed-by=/usr/share/keyrings/qubes-archive-keyring-4.2.gpg ] https://deb.qubes-os.org/r4.2/vm bookworm main
+#deb [arch=amd64 signed-by=/usr/share/keyrings/qubes-archive-keyring-4.2.gpg ] https://deb.qubes-os.org/r4.2/vm bookworm main
 #deb-src [arch=amd64 signed-by=/usr/share/keyrings/qubes-archive-keyring-4.2.gpg ] https://deb.qubes-os.org/r4.2/vm bookworm main
 
 # Qubes updates candidates repository
@@ -17,7 +17,7 @@ deb [arch=amd64 signed-by=/usr/share/keyrings/qubes-archive-keyring-4.2.gpg ] ht
 
 # Qubes Tor updates repositories
 # Main qubes updates repository
-#deb [arch=amd64 signed-by=/usr/share/keyrings/qubes-archive-keyring-4.2.gpg] tor+http://deb.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.2/vm bookworm main
+deb [arch=amd64 signed-by=/usr/share/keyrings/qubes-archive-keyring-4.2.gpg] tor+http://deb.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.2/vm bookworm main
 #deb-src  [arch=amd64 signed-by=/usr/share/keyrings/qubes-archive-keyring-4.2.gpg ] tor+http://deb.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r4.2/vm bookworm main
 
 # Qubes updates candidates repository

diff --git a/user_salt/common/onionize-repositories/files/qubes-templates.repo b/user_salt/common/onionize-repositories/files/qubes-templates.repo
index 76c8fe0a46e248f6f3f6fc59b8a6b81f320f12e8..58b1c3f48952424aa15613238319685851ae5277 100644 (file)
--- a/user_salt/common/onionize-repositories/files/qubes-templates.repo
+++ b/user_salt/common/onionize-repositories/files/qubes-templates.repo
@@ -1,7 +1,7 @@
 [qubes-templates-itl]
 name = Qubes Templates repository
-baseurl = https://yum.qubes-os.org/r$releasever/templates-itl
-#baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r$releasever/templates-itl
+#baseurl = https://yum.qubes-os.org/r$releasever/templates-itl
+baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r$releasever/templates-itl
 #metalink = https://yum.qubes-os.org/r$releasever/templates-itl/repodata/repomd.xml.metalink
 enabled = 1
 fastestmirror = 1
@@ -11,8 +11,8 @@ gpgkey = file:///etc/qubes/repo-templates/keys/RPM-GPG-KEY-qubes-$releasever-pri
 
 [qubes-templates-itl-testing]
 name = Qubes Templates repository
-baseurl = https://yum.qubes-os.org/r$releasever/templates-itl-testing
-#baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r$releasever/templates-itl-testing
+#baseurl = https://yum.qubes-os.org/r$releasever/templates-itl-testing
+baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r$releasever/templates-itl-testing
 #metalink = https://yum.qubes-os.org/r$releasever/templates-itl-testing/repodata/repomd.xml.metalink
 enabled = 0
 fastestmirror = 1
@@ -21,8 +21,8 @@ gpgkey = file:///etc/qubes/repo-templates/keys/RPM-GPG-KEY-qubes-$releasever-pri
 
 [qubes-templates-community]
 name = Qubes Community Templates repository
-baseurl = https://yum.qubes-os.org/r$releasever/templates-community
-#baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r$releasever/templates-community
+#baseurl = https://yum.qubes-os.org/r$releasever/templates-community
+baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r$releasever/templates-community
 #metalink = https://yum.qubes-os.org/r$releasever/templates-community/repodata/repomd.xml.metalink
 enabled = 0
 fastestmirror = 1
@@ -32,8 +32,8 @@ gpgkey = file:///etc/qubes/repo-templates/keys/RPM-GPG-KEY-qubes-$releasever-tem
 
 [qubes-templates-community-testing]
 name = Qubes Community Templates repository
-baseurl = https://yum.qubes-os.org/r$releasever/templates-community-testing
-#baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r$releasever/templates-community-testing
+#baseurl = https://yum.qubes-os.org/r$releasever/templates-community-testing
+baseurl = http://yum.qubesosfasa4zl44o4tws22di6kepyzfeqv3tg4e3ztknltfxqrymdad.onion/r$releasever/templates-community-testing
 #metalink = https://yum.qubes-os.org/r$releasever/templates-community-testing/repodata/repomd.xml.metalink
 enabled = 0
 fastestmirror = 1