From f69e73c33ebdff91d22a06ff4ed08f6c95954d2a Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 1 Sep 2020 07:26:18 +0200
Subject: F30 repo is closed

---
 fedora/30/index.html | 40 ++++++++++++++++++++--------------------
 index.html           |  3 ++-
 mkmodular            |  2 +-
 wizard/index.php     |  8 ++++----
 4 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/fedora/30/index.html b/fedora/30/index.html
index 044f2dfb..096690ea 100644
--- a/fedora/30/index.html
+++ b/fedora/30/index.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<meta content="text/html; charset=utf-8" http-equiv="content-type" />
-	<title>Remi's RPM repository - Fedora 30</title>
+	<title>Remi's RPM repository - Fedora 30 - Closed</title>
 	<link href="remi/x86_64/repoview/layout/repostyle.css" type="text/css" rel="stylesheet" />
 	<meta content="index,follow" name="robots" />
 	<link rel="shortcut icon" href="/favicon.ico" />
@@ -28,77 +28,77 @@
 					<h3>modular</h3>
 					<ul class="pkglist">
 						<li>
-							<a href="modular/i386/repoview/" class="inpage">i386</a>
+							<a href="modular/i386/repoview/" class="inpage">i386</a> - <b>Closed</b>
 						</li>
 						<li>
-							<a href="modular/x86_64/repoview/" class="inpage">x86_64</a>
+							<a href="modular/x86_64/repoview/" class="inpage">x86_64</a> - <b>Closed</b>
 						</li>
 					</ul>
 					<h3>remi (PHP 7.3 and some others)</h3>
 					<ul class="pkglist">
 						<li>
-							<a href="remi/i386/repoview/" class="inpage">i386</a>
+							<a href="remi/i386/repoview/" class="inpage">i386</a> - <b>Closed</b>
 						</li>
 						<li>
-							<a href="remi/x86_64/repoview/" class="inpage">x86_64</a>
+							<a href="remi/x86_64/repoview/" class="inpage">x86_64</a> - <b>Closed</b>
 						</li>
 					</ul>
 					<h3>remi-php74 (only PHP 7.4 and extensions, also needs remi)</h3>
 					<ul class="pkglist">
 						<li>
-							<a href="php74/i386/repoview/" class="inpage">i386</a>
+							<a href="php74/i386/repoview/" class="inpage">i386</a> - <b>Closed</b>
 						</li>
 						<li>
-							<a href="php74/x86_64/repoview/" class="inpage">x86_64</a>
+							<a href="php74/x86_64/repoview/" class="inpage">x86_64</a> - <b>Closed</b>
 						</li>
 					</ul>
 					<h3>Test packages, please try them</h3>
 					<ul class="pkglist">
 						<li>
-							<a href="test74/i386/repoview/" class="inpage">PHP 7.4 - i386</a>
+							<a href="test74/i386/repoview/" class="inpage">PHP 7.4 - i386</a> - <b>Closed</b>
 						</li>
 						<li>
-							<a href="test74/x86_64/repoview/" class="inpage">PHP 7.4 - x86_64</a>
+							<a href="test74/x86_64/repoview/" class="inpage">PHP 7.4 - x86_64</a> - <b>Closed</b>
 						</li>
 						<li>
-							<a href="test/i386/repoview/" class="inpage">PHP 7.3 - i386</a>
+							<a href="test/i386/repoview/" class="inpage">PHP 7.3 - i386</a> - <b>Closed</b>
 						</li>
 						<li>
-							<a href="test/x86_64/repoview/" class="inpage">PHP 7.3 - x86_64</a>
+							<a href="test/x86_64/repoview/" class="inpage">PHP 7.3 - x86_64</a> - <b>Closed</b>
 						</li>
 					</ul>
 					<h3>development</h3>
 					<ul class="pkglist">
 						<li>
-							<a href="devs/x86_64/repoview/" class="inpage">x86_64</a>
+							<a href="devs/x86_64/repoview/" class="inpage">x86_64</a> - <b>Closed</b>
 							really <b>experimental</b> stuff
 						</li>
 					</ul>
 					<h3>debuginfo</h3>
 					<ul class="pkglist">
 						<li>
-							<a href="debug-remi/i386/repoview/" class="inpage">remi - i386</a>
+							<a href="debug-remi/i386/repoview/" class="inpage">remi - i386</a> - <b>Closed</b>
 						</li>
 						<li>
-							<a href="debug-remi/x86_64/repoview/" class="inpage">remi - x86_64</a>
+							<a href="debug-remi/x86_64/repoview/" class="inpage">remi - x86_64</a> - <b>Closed</b>
 						</li>
 						<li>
-							<a href="debug-php74/i386/repoview/" class="inpage">php74 - i386</a>
+							<a href="debug-php74/i386/repoview/" class="inpage">php74 - i386</a> - <b>Closed</b>
 						</li>
 						<li>
-							<a href="debug-php74/x86_64/repoview/" class="inpage">php74 - x86_64</a>
+							<a href="debug-php74/x86_64/repoview/" class="inpage">php74 - x86_64</a> - <b>Closed</b>
 						</li>
 						<li>
-							<a href="debug-test/i386/repoview/" class="inpage">test - i386</a>
+							<a href="debug-test/i386/repoview/" class="inpage">test - i386</a> - <b>Closed</b>
 						</li>
 						<li>
-							<a href="debug-test/x86_64/repoview/" class="inpage">test - x86_64</a>
+							<a href="debug-test/x86_64/repoview/" class="inpage">test - x86_64</a> - <b>Closed</b>
 						</li>
 						<li>
-							<a href="debug-test74/i386/repoview/" class="inpage">php74 - test - i386</a>
+							<a href="debug-test74/i386/repoview/" class="inpage">php74 - test - i386</a> - <b>Closed</b>
 						</li>
 						<li>
-							<a href="debug-test74/x86_64/repoview/" class="inpage">php74 - test - x86_64</a>
+							<a href="debug-test74/x86_64/repoview/" class="inpage">php74 - test - x86_64</a> - <b>Closed</b>
 						</li>
 					</ul>
 				</div>
diff --git a/index.html b/index.html
index 475d94c4..1589efb7 100644
--- a/index.html
+++ b/index.html
@@ -302,14 +302,15 @@
 						</li>
 					</ul>
 <!--
--->
 					<h3>EOL Fedora - All packages are maintained - Upgrade heartily recommended</h3>
 					<ul class="pkglist">
 						<li><a href="fedora/30/" class="inpage">Fedora 30</a></li>
 					</ul>
+-->
 
 					<h3>EOL Fedora - No more package update - Upgrade is mandatory</h3>
 					<ul class="pkglist">
+						<li><a href="fedora/30/" class="inpage">Fedora 30</a></li>
 						<li><a href="fedora/29/" class="inpage">Fedora 29</a></li>
 						<li><a href="fedora/28/" class="inpage">Fedora 28</a></li>
 						<li><a href="https://rpms.remirepo.net/archives/fedora/27/" class="inpage">Fedora 27</a></li>
diff --git a/mkmodular b/mkmodular
index e83909c1..135b3a1e 100755
--- a/mkmodular
+++ b/mkmodular
@@ -295,7 +295,7 @@ rename($data, "$data.$arch");
 chdir(__DIR__);
 }
 
-if (count($_SERVER['argv']) < 2 || in_array('f30', $_SERVER['argv'])) {
+if (count($_SERVER['argv']) > 1 && in_array('f30', $_SERVER['argv'])) {
 	$dest = 'fedora/30/modular/x86_64';
 	echo "Populate $dest\n";
 	cleanup($dest);
diff --git a/wizard/index.php b/wizard/index.php
index b0686692..55d99000 100644
--- a/wizard/index.php
+++ b/wizard/index.php
@@ -21,9 +21,9 @@ $osvers = [
     'CentOS 8'  => ['7.2','7.3'],
     'CentOS 7'  => '5.4',
     'CentOS 6'  => '5.3',
+    'Fedora 33' => '7.4',
     'Fedora 32' => '7.4',
     'Fedora 31' => '7.3',
-    'Fedora 30' => '7.3',
 ];
 $osmin = [
     'RHEL 8'    => '5.6',
@@ -32,9 +32,9 @@ $osmin = [
     'CentOS 8'  => '5.6',
     'CentOS 7'  => '5.4',
     'CentOS 6'  => '5.4',
+    'Fedora 33' => '5.6',
     'Fedora 32' => '5.6',
     'Fedora 31' => '5.6',
-    'Fedora 30' => '5.6',
 ];
 $osmax = [
     'RHEL 8'    => '8.0',
@@ -43,9 +43,9 @@ $osmax = [
     'CentOS 8'  => '8.0',
     'CentOS 7'  => '8.0',
     'CentOS 6'  => '7.3',
+    'Fedora 33' => '8.0',
     'Fedora 32' => '8.0',
     'Fedora 31' => '8.0',
-    'Fedora 30' => '7.4',
 ];
 $osname = [
     'RHEL 8'    => 'RHEL-8',
@@ -54,9 +54,9 @@ $osname = [
     'CentOS 8'  => 'CentOS 8',
     'CentOS 7'  => 'CentOS 7 (maintained until June 2024)',
     'CentOS 6'  => 'CentOS 6 (maintained until November 2020)',
+    'Fedora 33' => 'Fedora 33 (development version)',
     'Fedora 32' => 'Fedora 32',
     'Fedora 31' => 'Fedora 31',
-    'Fedora 30' => 'Fedora 30 (EOL since May 2020)',
 ];
 $grpname = [
     'RHEL'    => 'Red Hat Enterprise Linux',
-- 
cgit 

