Add Mageia Cauldron netinstall and obsolete Mageia 7 iso

3 files changed, 65 insertions, 14 deletions

diff --git a/en/downloads/get/definitions.ini b/en/downloads/get/definitions.ini
index 376beaea6..5f2955099 100644
--- a/en/downloads/get/definitions.ini
+++ b/en/downloads/get/definitions.ini
@@ -1610,6 +1610,7 @@ path = "distrib/7.1/i586/install/images"
 sha512 = "13c63a10d983c379f2a3563577815976d7108764cf6c089b14cbf7e813b95ac47832ed19dbac78afedc99a279087769505f91508a20ecafa112ba7e6f25d67dc"
 name = "Mageia 7.1 Netinstall 32bit"
 size = "around 39 MB"
+obsolete = "yes"
 
 ;
 [Mageia-7.1-netinstall-nonfree-i586.iso]
@@ -1618,6 +1619,7 @@ path = "distrib/7.1/i586/install/images"
 sha512 = "aa9ea9052e5de2fd952a4968c9fb0897ecc702d1be980a40d85cca8ee92e87e0818aee8a844d770f6e102c2fd20b8062a7c09a6ac20dd4111ceff933f52bb115"
 name = "Mageia 7.1 Netinstall Nonfree 32bit"
 size= "around 66 MB"
+obsolete = "yes"
 
 ;
 [Mageia-7.1-netinstall-x86_64.iso]
@@ -1626,6 +1628,7 @@ path = "distrib/7.1/x86_64/install/images"
 sha512 = "d042514399b0ec856d22c4d54cccfd582a6da202865c8eeb3a0812f69869d92a9be457dc0e368e8dff51d16aa2bf4759325ef2bacbf82c347f67938656a36e33"
 name = "Mageia 7.1 Netinstall 64bit"
 size = "around 52 MB"
+obsolete = "yes"
 
 ;
 [Mageia-7.1-netinstall-nonfree-x86_64.iso]
@@ -1634,8 +1637,7 @@ path = "distrib/7.1/x86_64/install/images"
 sha512 = "b3c22e16f79edcf1bd4412049bcb8d052910efb1ccdfa17ddfd538f973c01f2919b3a57b67e484fe7429483328339e586a2506e824a0a8818c3103bafd3df4c3"
 name = "Mageia 7.1 Netinstall Nonfree 64bit"
 size = " 81 MB"
-
-
+obsolete = "yes"
 
 ;
 [Mageia-7.1-Live-GNOME-x86_64.iso]
@@ -1650,6 +1652,7 @@ torrent = "iso/7.1/torrents/Mageia-7.1-Live-GNOME-x86_64.torrent"
 magnet = "magnet:?xt=urn:btih:d8e087e0ef9574ea57f9867e5aa9852781d7fb1e&dn=Mageia-7.1-Live-GNOME-x86_64&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337"
 name = "Mageia 7.1 Live GNOME 64bit"
 size = "2.5 GB"
+obsolete = "yes"
 
 ;
 [Mageia-7.1-Live-Plasma-x86_64.iso]
@@ -1664,6 +1667,7 @@ torrent = "iso/7.1/torrents/Mageia-7.1-Live-Plasma-x86_64.torrent"
 magnet = "magnet:?xt=urn:btih:05c29597c5e9dcd0fc0e77db84b459882936c1af&dn=Mageia-7.1-Live-Plasma-x86_64&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337"
 name = "Mageia 7.1 Live Plasma 64bit"
 size = "2.8 GB"
+obsolete = "yes"
 
 ;
 [Mageia-7.1-Live-Xfce-i586.iso]
@@ -1678,6 +1682,7 @@ torrent = "iso/7.1/torrents/Mageia-7.1-Live-Xfce-i586.torrent"
 magnet = "magnet:?xt=urn:btih:2ab1c712c23a92007b34cf3415c912b004ba3a0e&dn=Mageia-7.1-Live-Xfce-i586&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337"
 name = "Mageia 7.1 Live Xfce 32bit"
 size = "2.2 GB"
+obsolete = "yes"
 
 ;
 [Mageia-7.1-Live-Xfce-x86_64.iso]
@@ -1692,6 +1697,7 @@ torrent = "iso/7.1/torrents/Mageia-7.1-Live-Xfce-x86_64.torrent"
 magnet = "magnet:?xt=urn:btih:dd542c11d921924da4b603740786b2642f6fa0a3&dn=Mageia-7.1-Live-Xfce-x86_64&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337"
 name = "Mageia 7.1 Live Xfce 64bit"
 size = "2.3 GB"
+obsolete = "yes"
 
 ;
 [Mageia-7.1-i586.iso]
@@ -1705,6 +1711,7 @@ torrent = "iso/7.1/torrents/Mageia-7.1-i586.torrent"
 magnet = "magnet:?xt=urn:btih:7422fc1d5454eb4356c22846bccff738e9573272&dn=Mageia-7.1-i586&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451"
 name = "Mageia 7.1 32bit"
 size = "4.1 GB"
+obsolete = "yes"
 
 ;
 [Mageia-7.1-x86_64.iso]
@@ -1718,6 +1725,7 @@ torrent = "iso/7.1/torrents/Mageia-7.1-x86_64.torrent"
 magnet = "magnet:?xt=urn:btih:7a623c3144e9971e77d89d7a18f54c1a27a9bb41&dn=Mageia-7.1-x86_64&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337"
 name = "Mageia 7.1 64bit"
 size = "4.2 GB"
+obsolete = "yes"
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -1854,3 +1862,49 @@ torrent = "iso/8/torrents/Mageia-8-x86_64.torrent"
 magnet = "magnet:?xt=urn:btih:7618a41b56f914221e458ec55e6dfd9d59fc2780&dn=Mageia-8-x86_64&tr=udp%3A%2F%2Ftracker.torrent.eu.org%3A451&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337"
 name = "Mageia 8 64bit"
 size = "4.2 GB"
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;; Mageia 9
+;;;;;;;;;;;;;;;;;;;;;
+
+
+;
+[Mageia-Cauldron-netinstall-i586.iso]
+file = "Mageia-Cauldron-netinstall-i586.iso"
+md5 = "72e1dfbb70149b7ba318a35482e02e5a"
+path = "distrib/cauldron/i586/install/images"
+name = "Mageia Cauldron netinstall 32bit"
+size = "47 MB"
+sha3 = "319FBDD0057B03E8808B19DE698827FE58B5E615D9008DBECA4244DBB3052A5D03647ACD4899C5241E60D6271FA7EF2FB18FBBF902048D9E2721CFF8282E9BB5"
+sha512 = "a9284721d10ebd72b41247f02bfb5a51423054e47a1ae0903dc39023ab03265e0d1b18f9e8db3ed73409bbe9cba31d52ea0f826be150bdc9f595c5e3c118f9ab"
+
+;
+[Mageia-Cauldron-netinstall-nonfree-i586.iso]
+file = "Mageia-Cauldron-netinstall-nonfree-i586.iso"
+md5 = "948e48c4ef1ee0517b91a0767238dce5"
+path = "distrib/cauldron/i586/install/images"
+name = "Mageia Cauldron netinstall nonfree 32bit"
+size = "102 MB"
+sha3 = "715AEA5F8AC3A25C6A112F0D9ED6028DE346B61850EC9983490427B2FE7EAFAF31A8CBDE4C9696D45D3B9F4FE6ACD50B4B81A53CE8F3FFCC2FFBCE3FF61C40A6"
+sha512 = "28718f87ef49506af4f80041beb66e4829c8b44906d5b7a2a2c38190a344f4e73e963e7053893fc07d5d8028d35b3258b27c862d736368ce4926d99c04ba7a67"
+
+;
+[Mageia-Cauldron-netinstall-nonfree-x86_64.iso]
+file = "Mageia-Cauldron-netinstall-nonfree-x86_64.iso"
+md5 = "7ec0ac040903638ef4a457fd77964cd1"
+path = "distrib/cauldron/x86_64/install/images"
+name = "Mageia Cauldron netinstall nonfree 64bit"
+size = "122 MB"
+sha3 = "7B60B57D399C1B295B21ABBED46FAEBAFE048ECF3C9F773E9DE1CB348A769ED523BAFAED39CB43C597C52C90298B6BB5F631ACF07FBCAC6363D5E62BF51B892C"
+sha512 = "12bdbdbc1d5ff7c4c6d6fa6407355591a67822d52e9a604c89826de80db00ed7fcc895e4da79315a615713d59842296a002098a4a273cc9dbb29d32cb937a10a"
+
+;
+[Mageia-Cauldron-netinstall-x86_64.iso]
+file = "Mageia-Cauldron-netinstall-x86_64.iso"
+md5 = "96abb039b16e8beb91021db5ca1ba437"
+path = "distrib/cauldron/x86_64/install/images"
+name = "Mageia Cauldron netinstall 64bit"
+size = "64 MB"
+sha3 = "9C9C4AD7580B29D02AD0CBB7BC3EF5828BA5ABF3EA5FC47EBA2EDAEE5D600C012FD458396B4010DA3B5D1F7FC4984FD60F9EF66DB11F304C2E97098970131C11"
+sha512 = "d93cc339779180062a7f8f5a75f4f10ea43cf09b376cc701a2d4e3e6d0b8a999553e895d9d0afc93fecf3000b9a85a58df7b329717836f72094608b08bd49436"
diff --git a/en/downloads/prerelease/download_index.php b/en/downloads/prerelease/download_index.php
index 6dc0a709b..fb4a147c6 100644
--- a/en/downloads/prerelease/download_index.php
+++ b/en/downloads/prerelease/download_index.php
@@ -1,11 +1,11 @@
 <?php
 
 $name = 'Mageia';
-$version = '8'; 
-$release = 'rc';
-$torrentavailable=true;
-$classical=true;
-$live=true;
+$version = 'Cauldron';
+$release = '';
+$torrentavailable=false;
+$classical=false;
+$live=false;
 
 
 define('HLANG', true);
@@ -91,12 +91,12 @@ input[type="radio"], input[type="submit"], .popover-content  {
 
     <h1 id="mgnavt"><?php echo sprintf(_g('Download') . ' <strong>%s %s %s</strong>',$name, $version, $release)?></h1>
         <?php include './nav.php'; ?>
-        <div class="bg-warning">
+        <div class="bg-danger">
         <p class="text-white p-3 container"><?php
-//		_g('Be careful! This is an alpha, unstable release.');
+		_g('Be careful! This is an alpha, unstable release.');
 //		_g('Be careful! This is a beta, unstable release.');
 //		_g('It is only intended for developer use. <strong>DO NOT USE THIS IN PRODUCTION OR FOR OFFICIAL REVIEW.</strong>');
-		_g('This is a Release Candidate. Release Candidate software is software that has graduated Beta testing, and should be a release-ready product suitable for advanced users and reviewers. However, beginning users and critical-applications users may wish to wait for the final release planned for %s.', array(_r('february 2021')), ' '); _g('Release Candidate is intended to identify any remaining bugs or missing packages.'); ?></p>
+//		_g('This is a Release Candidate. Release Candidate software is software that has graduated Beta testing, and should be a release-ready product suitable for advanced users and reviewers. However, beginning users and critical-applications users may wish to wait for the final release planned for %s.', array(_r('february 2021')), ' '); _g('Release Candidate is intended to identify any remaining bugs or missing packages.'); ?></p>
 		</div>
  
 
diff --git a/en/downloads/prerelease/index.php b/en/downloads/prerelease/index.php
index cb52e38a9..fa20f9ddc 100644
--- a/en/downloads/prerelease/index.php
+++ b/en/downloads/prerelease/index.php
@@ -1,4 +1 @@
-<?php 
-
-require_once '../../../langs.inc.php';
-relocate($langs, '8/');
+<?php include './download_index.php';