move Cauldron netinstall into separate category + fix gpg filenames

1 files changed, 77 insertions, 60 deletions

diff --git a/en/downloads/get/definitions.ini b/en/downloads/get/definitions.ini
index a7f1469b3..6e191080b 100644
--- a/en/downloads/get/definitions.ini
+++ b/en/downloads/get/definitions.ini
@@ -2008,46 +2008,6 @@ size = "4.2 GB"
 ;;;;;;;;;;;;;;;;;;;;;
 
 ;
-[Mageia-Cauldron-netinstall-i686.iso]
-file = "Mageia-Cauldron-netinstall-i686.iso"
-md5 = "read the file"
-path = "distrib/cauldron/i686/install/images"
-name = "Mageia Cauldron netinstall 32bit"
-size = "48 MB"
-sha3 = "read the file"
-sha512 = "read the file"
-
-;
-[Mageia-Cauldron-netinstall-nonfree-i686.iso]
-file = "Mageia-Cauldron-netinstall-nonfree-i686.iso"
-md5 = "read the file"
-path = "distrib/cauldron/i686/install/images"
-name = "Mageia Cauldron netinstall nonfree 32bit"
-size = "100 MB"
-sha3 = "read the file"
-sha512 = "read the file"
-
-;
-[Mageia-Cauldron-netinstall-nonfree-x86_64.iso]
-file = "Mageia-Cauldron-netinstall-nonfree-x86_64.iso"
-md5 = "read the file"
-path = "distrib/cauldron/x86_64/install/images"
-name = "Mageia Cauldron netinstall nonfree 64bit"
-size = "122 MB"
-sha3 = "read the file"
-sha512 = "read the file"
-
-;
-[Mageia-Cauldron-netinstall-x86_64.iso]
-file = "Mageia-Cauldron-netinstall-x86_64.iso"
-md5 = "read the file"
-path = "distrib/cauldron/x86_64/install/images"
-name = "Mageia Cauldron netinstall 64bit"
-size = "70 MB"
-sha3 = "read the file"
-sha512 = "read the file"
-
-;
 [Mageia-10-alpha1-netinstall-i686.iso]
 file = "Mageia-Cauldron-netinstall-i686.iso"
 md5 = "d8923e38b21175348a521ed3e80e8eef"
@@ -2091,13 +2051,15 @@ sha512 = "f2657c48d99a9796fa3403ad0b9cba9f0e385e0b706b42b06e129562c5bdb9330a3c26
 [Mageia-10-alpha1-Live-GNOME-x86_64.iso]
 file = "Mageia-10-alpha1-Live-GNOME-x86_64.iso"
 md5 = "554497968d82ec81564c8d71d7296314"
-md5.gpg = "Mageia-10-alpha1-Live-GNOME-x86_64.md5.gpg"
+md5.gpg = "Mageia-10-alpha1-Live-GNOME-x86_64.iso.md5.gpg"
 sha3 = "FDDB43D454D539C73804D4DACDC248959A426D0E84CE17CE632C1F694142391298C415767DEBA94183157ED11A7EE636AF49EAE58D7D3DE8621C88E54EC21BE9"
-sha3.gpg = "Mageia-10-alpha1-Live-GNOME-x86_64.iso.sha3"
+sha3.gpg = "Mageia-10-alpha1-Live-GNOME-x86_64.iso.sha3.gpg"
 sha512 = "0dfeee9b178685ec805277b0281d45925989c02bae1788dc52ddc8b0e2b460d7c7047ef889fdc201a713cbc3e632a4b71907c184d0868c04903280d560fc807a"
-sha512.gpg = "Mageia-10-alpha1-Live-GNOME-x86_64.sha512.gpg"
+sha512.gpg = "Mageia-10-alpha1-Live-GNOME-x86_64.iso.sha512.gpg"
 langs = "English (American) (en_US)"
 path = "iso/10/Mageia-10-alpha1-Live-GNOME-x86_64"
+;torrent = "iso/10/torrents/Mageia-10-alpha1-Live-GNOME-x86_64.torrent"
+;magnet = "magnet:?xt=urn:btih:bbe5221d5081138e41e141e273c520c2ba942b87&dn=Mageia-9-i586&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337"
 name = "Mageia 10 alpha1 Live GNOME 64bit"
 size = "4.2 GB"
 
@@ -2105,13 +2067,15 @@ size = "4.2 GB"
 [Mageia-10-alpha1-Live-Plasma-x86_64.iso]
 file = "Mageia-10-alpha1-Live-Plasma-x86_64.iso"
 md5 = "975bac001a296ead4c3ba496c68a77a3"
-md5.gpg = "Mageia-10-alpha1-Live-Plasma-x86_64.md5.gpg"
+md5.gpg = "Mageia-10-alpha1-Live-Plasma-x86_64.iso.md5.gpg"
 sha3 = "A0A8A749FEFA14214C081E4BD694CE677F4FD1C2E16EC97C3DEC2E7846BE9AFA282B4044E2E6F8EB6230049FDBCE1606838AF703FB392DF7AA81C505DB029F4A"
-sha3.gpg = "Mageia-10-alpha1-Live-Plasma-x86_64.iso.sha3"
+sha3.gpg = "Mageia-10-alpha1-Live-Plasma-x86_64.iso.sha3.gpg"
 sha512 = "71349dbc4306e305a1a2dc8b8c76157e67d2865f273a01a36de97a20fdf64988b9eb8d2a73e1e40cb30d3c2d99531765cb114ab6d279c37f025cd186e2a24ef0"
-sha512.gpg = "Mageia-10-alpha1-Live-Plasma-x86_64.sha512.gpg"
+sha512.gpg = "Mageia-10-alpha1-Live-Plasma-x86_64.iso.sha512.gpg"
 langs = "English (American) (en_US)"
 path = "iso/10/Mageia-10-alpha1-Live-Plasma-x86_64"
+;torrent = "iso/10/torrents/Mageia-10-alpha1-Live-Plasma-x86_64.torrent"
+;magnet = "magnet:?xt=urn:btih:4e93ec552f334d2c59d470c7f742ad444b42f419&dn=Mageia-10-alpha1-Live-Plasma-x86_64&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337"
 name = "Mageia 10 alpha1 Live Plasma 64bit"
 size = "4.5 GB"
 
@@ -2119,13 +2083,15 @@ size = "4.5 GB"
 [Mageia-10-alpha1-Live-Xfce-i686.iso]
 file = "Mageia-10-alpha1-Live-Xfce-i686.iso"
 md5 = "20c1a77c8bf7984613a059241cb09566"
-md5.gpg = "Mageia-10-alpha1-Live-Xfce-i686.md5.gpg"
+md5.gpg = "Mageia-10-alpha1-Live-Xfce-i686.iso.md5.gpg"
 sha3 = "4D012DE133942D681FC861B9CBB3DAEFA8E4D317110BDBAA1E46873795210024C4EEF8E37260F884B11A4D9C201FFAF1DCE30A5F28E796658E2DA5F02AEB5618"
-sha3.gpg = "Mageia-10-alpha1-Live-Xfce-i686.iso.sha3"
+sha3.gpg = "Mageia-10-alpha1-Live-Xfce-i686.iso.sha3.gpg"
 sha512 = "9b1503b4b04b8077b8a184e7b379461a6ff2ac93f26e8142f467e85512c721adb06075300f2838d6535886149a3d67a0bc9d660583727bf1f72fc27b21c4eb59"
-sha512.gpg = "Mageia-10-alpha1-Live-Xfce-i686.sha512.gpg"
+sha512.gpg = "Mageia-10-alpha1-Live-Xfce-i686.iso.sha512.gpg"
 langs = "English (American) (en_US)"
 path = "iso/10/Mageia-10-alpha1-Live-Xfce-i686"
+;torrent = "iso/10/torrents/Mageia-10-alpha1-Live-Xfce-i686.torrent"
+;magnet = "magnet:?xt=urn:btih:34ba49aa063e6618ef25f012a7d13233be09204c&dn=Mageia-10-alpha1-Live-Xfce-i686&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337"
 name = "Mageia 10 alpha1 Live Xfce 32bit"
 size = "3.5 GB"
 
@@ -2133,26 +2099,30 @@ size = "3.5 GB"
 [Mageia-10-alpha1-Live-Xfce-x86_64.iso]
 file = "Mageia-10-alpha1-Live-Xfce-x86_64.iso"
 md5 = "822ed9bfac577f1bd9e4b1df08ae04cf"
-md5.gpg = "Mageia-10-alpha1-Live-Xfce-x86_64.md5.gpg"
+md5.gpg = "Mageia-10-alpha1-Live-Xfce-x86_64.iso.md5.gpg"
 sha3 = "96481EC9AC89BB43C59F1737C08459B44928A837AF480EDB0CFF6960EA2809C21EF09355CBE43B0C723A93202F4D38671B74310D83EE5CA759D461D038368E51"
-sha3.gpg = "Mageia-10-alpha1-Live-Xfce-x86_64.iso.sha3"
+sha3.gpg = "Mageia-10-alpha1-Live-Xfce-x86_64.iso.sha3.gpg"
 sha512 = "29bef681af8d12f7968fbc63e1858bfd358e4827370ba162d7b8ed1e558a66fa83c7f37be66734996df1092c2bd6b9831d2c2b149a5163fda6fbef4c506ae19d"
-sha512.gpg = "Mageia-10-alpha1-Live-Xfce-x86_64.sha512.gpg"
+sha512.gpg = "Mageia-10-alpha1-Live-Xfce-x86_64.iso.sha512.gpg"
 langs = "English (American) (en_US)"
 path = "iso/10/Mageia-10-alpha1-Live-Xfce-x86_64"
+;torrent = "iso/10/torrents/Mageia-10-alpha1-Live-Xfce-x86_64.torrent"
+;magnet = "magnet:?xt=urn:btih:f17f940c65f39eba117a8374efe5a37d4d8c43ac&dn=Mageia-10-alpha1-Live-Xfce-x86_64&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337"
 name = "Mageia 10 alpha1 Live Xfce 64bit"
-size = "4 GB"
+size = "4.0 GB"
 
 ;
 [Mageia-10-alpha1-i686.iso]
 file = "Mageia-10-alpha1-i686.iso"
 md5 = "c22d33fdd798b9e5d5947d3df731cbf6"
-md5.gpg = "Mageia-10-alpha1-i686.md5.gpg"
+md5.gpg = "Mageia-10-alpha1-i686.iso.md5.gpg"
 sha3 = "A32AC391DBAAA60CB60C7774E7425324F4B88B99B7A9FB0015BB02E049D6E3C295E6691EBE7E7873BCC80537DEBA4883631B9BB04C6C01CD3B9C84B005EDAC68"
-sha3.gpg = "Mageia-10-alpha1-i686.iso.sha3"
+sha3.gpg = "Mageia-10-alpha1-i686.iso.sha3.gpg"
 sha512 = "b07d0265a4f66ad8a9e00fa7dd8ec63d0cb3059b3cb8aeb7921556447e7f65893af75fc12f9eaaa5116a6b0f124717fc54b95316bc2f64d10bfdd2f6e698a890"
-sha512.gpg = "Mageia-10-alpha1-i686.sha512.gpg"
+sha512.gpg = "Mageia-10-alpha1-i686.iso.sha512.gpg"
 path = "iso/10/Mageia-10-alpha1-i686"
+;torrent = "iso/10/torrents/Mageia-10-alpha1-i686.torrent"
+;magnet = "magnet:?xt=urn:btih:bbe5221d5081138e41e141e273c520c2ba942b87&dn=Mageia-10-alpha1-i686&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337"
 name = "Mageia 10 alpha1 32bit"
 size = "4.3 GB"
 
@@ -2160,11 +2130,58 @@ size = "4.3 GB"
 [Mageia-10-alpha1-x86_64.iso]
 file = "Mageia-10-alpha1-x86_64.iso"
 md5 = "d65297f439d8157dfbda0b362f433961"
-md5.gpg = "Mageia-10-alpha1-x86_64.md5.gpg"
+md5.gpg = "Mageia-10-alpha1-x86_64.iso.md5.gpg"
 sha3 = "6B951A765D31E6C9A0AC41210733968B960E17333683D2E2476461C8DEBFDFEC3CD42D3DE6001E43E10F11A713C5FFD487267269372D4A4DFF3939D5B8D298F4"
-sha3.gpg = "Mageia-10-alpha1-x86_64.iso.sha3"
+sha3.gpg = "Mageia-10-alpha1-x86_64.iso.sha3.gpg"
 sha512 = "0628051e30d62a2e37107b9612a0622ee60b1b301e1de35e73b4d66780e83b63cd86e278710dd1bc4f56060904409be14814776c866d546e63fc84adf4c8e2a3"
-sha512.gpg = "Mageia-10-alpha1-x86_64.sha512.gpg"
+sha512.gpg = "Mageia-10-alpha1-x86_64.iso.sha512.gpg"
 path = "iso/10/Mageia-10-alpha1-x86_64"
+;torrent = "iso/10/torrents/Mageia-10-alpha1-x86_64.torrent"
+;magnet = "magnet:?xt=urn:btih:15e2ea11d5c680854dc10f9df192c330949abeec&dn=Mageia-10-alpha1-x86_64&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337"
 name = "Mageia 10 alpha1 64bit"
-size = "5 GB"
+size = "5.0 GB"
+
+;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;; Cauldron netinstall
+;;;;;;;;;;;;;;;;;;;;;
+
+;
+[Mageia-Cauldron-netinstall-i686.iso]
+file = "Mageia-Cauldron-netinstall-i686.iso"
+md5 = "read the file"
+path = "distrib/cauldron/i686/install/images"
+name = "Mageia Cauldron netinstall 32bit"
+size = "48 MB"
+sha3 = "read the file"
+sha512 = "read the file"
+
+;
+[Mageia-Cauldron-netinstall-nonfree-i686.iso]
+file = "Mageia-Cauldron-netinstall-nonfree-i686.iso"
+md5 = "read the file"
+path = "distrib/cauldron/i686/install/images"
+name = "Mageia Cauldron netinstall nonfree 32bit"
+size = "100 MB"
+sha3 = "read the file"
+sha512 = "read the file"
+
+;
+[Mageia-Cauldron-netinstall-nonfree-x86_64.iso]
+file = "Mageia-Cauldron-netinstall-nonfree-x86_64.iso"
+md5 = "read the file"
+path = "distrib/cauldron/x86_64/install/images"
+name = "Mageia Cauldron netinstall nonfree 64bit"
+size = "122 MB"
+sha3 = "read the file"
+sha512 = "read the file"
+
+;
+[Mageia-Cauldron-netinstall-x86_64.iso]
+file = "Mageia-Cauldron-netinstall-x86_64.iso"
+md5 = "read the file"
+path = "distrib/cauldron/x86_64/install/images"
+name = "Mageia Cauldron netinstall 64bit"
+size = "70 MB"
+sha3 = "read the file"
+sha512 = "read the file"