modular repo for EL-8 + rename

3 files changed, 108 insertions, 41 deletions

diff --git a/enterprise/8/modular/x86_64/httpsmirror b/enterprise/8/modular/x86_64/httpsmirror
new file mode 100644
index 00000000..a7d47580
--- /dev/null
+++ b/enterprise/8/modular/x86_64/httpsmirror
@@ -0,0 +1,11 @@
+https://remi.mirror.ate.info/enterprise/8/modular/x86_64/
+https://mirrors.tuna.tsinghua.edu.cn/remi/enterprise/8/modular/x86_64/
+https://mirror.oxilion.nl/remi/enterprise/8/modular/x86_64/
+https://remi.mirror.wearetriple.com/enterprise/8/modular/x86_64/
+https://mirrors.uni-ruse.bg/remi/enterprise/8/modular/x86_64/
+https://remi.mirror.karneval.cz/enterprise/8/modular/x86_64/
+https://mirror.netsite.dk/remi/enterprise/8/modular/x86_64/
+https://mirrors.ukfast.co.uk/sites/remi/enterprise/8/modular/x86_64/
+https://mirror.netweaver.uk/remi/enterprise/8/modular/x86_64/
+https://mir01.syntis.net/remirepo/enterprise/8/modular/x86_64/
+https://rpms.remirepo.net/enterprise/8/modular/x86_64/
diff --git a/enterprise/8/modular/x86_64/mirror b/enterprise/8/modular/x86_64/mirror
new file mode 100644
index 00000000..bf0efb31
--- /dev/null
+++ b/enterprise/8/modular/x86_64/mirror
@@ -0,0 +1,41 @@
+http://rpms.remirepo.net/enterprise/8/modular/x86_64/
+http://fr2.rpmfind.net/linux/remi/enterprise/8/modular/x86_64/
+http://mirrors.mediatemple.net/remi/enterprise/8/modular/x86_64/
+http://remi.mirrors.arminco.com/enterprise/8/modular/x86_64/
+http://remi.schlundtech.de/enterprise/8/modular/x86_64/
+## http://mirror5.layerjet.com/remi/enterprise/8/modular/x86_64/
+http://mirror.awanti.com/remi/enterprise/8/modular/x86_64/
+## http://mirror.1000mbps.com/remi/enterprise/8/modular/x86_64/
+http://remi.xpg.com.br/enterprise/8/modular/x86_64/
+http://mirror.cedia.org.ec/remi/enterprise/8/modular/x86_64/
+http://ftp.arnes.si/mirrors/remi/enterprise/8/modular/x86_64/
+http://remi.conetix.com.au/enterprise/8/modular/x86_64/
+## http://remi.mirror.net.in/enterprise/8/modular/x86_64/
+http://mirrors.neterra.net/remi/enterprise/8/modular/x86_64/
+http://mirrors.thzhost.com/remi/enterprise/8/modular/x86_64/
+http://mirror.uta.edu.ec/remi/enterprise/8/modular/x86_64/
+http://mirrors.netix.net/remi/enterprise/8/modular/x86_64/
+http://remi.mirrors.cu.be/enterprise/8/modular/x86_64/
+http://mirror.innosol.asia/remi/enterprise/8/modular/x86_64/
+http://mirror.neolabs.kz/remi/enterprise/8/modular/x86_64/
+http://mirror.veriteknik.net.tr/remi/enterprise/8/modular/x86_64/
+https://remi.mirror.ate.info/enterprise/8/modular/x86_64/
+https://mirrors.tuna.tsinghua.edu.cn/remi/enterprise/8/modular/x86_64/
+http://mirror.23media.de/remi/enterprise/8/modular/x86_64/
+http://repo1.ash.innoscale.net/remi/enterprise/8/modular/x86_64/
+http://repo1.sea.innoscale.net/remi/enterprise/8/modular/x86_64/
+http://repo1.dal.innoscale.net/remi/enterprise/8/modular/x86_64/
+http://mirror.bebout.net/remi/enterprise/8/modular/x86_64/
+https://mirror.oxilion.nl/remi/enterprise/8/modular/x86_64/
+https://remi.mirror.wearetriple.com/enterprise/8/modular/x86_64/
+http://mirror.upb.edu.co/remi/enterprise/8/modular/x86_64/
+https://mirrors.uni-ruse.bg/remi/enterprise/8/modular/x86_64/
+https://remi.mirror.karneval.cz/enterprise/8/modular/x86_64/
+https://mirror.netsite.dk/remi/enterprise/8/modular/x86_64/
+http://mirror.reconn.ru/remi/enterprise/8/modular/x86_64/
+https://mirrors.ukfast.co.uk/sites/remi/enterprise/8/modular/x86_64/
+https://mirror.netweaver.uk/remi/enterprise/8/modular/x86_64/
+http://mirror.xeonbd.com/remi/enterprise/8/modular/x86_64/
+http://mirror.team-cymru.com/remi/enterprise/8/modular/x86_64/
+http://ftp.riken.jp/Linux/remi/enterprise/8/modular/x86_64/
+https://mir01.syntis.net/remirepo/enterprise/8/modular/x86_64/
diff --git a/mkmodular b/mkmodular
index ff401c40..95eff08e 100755
--- a/mkmodular
+++ b/mkmodular
@@ -7,14 +7,16 @@ $template_php = <<< EOT
 document: modulemd
 version: 2
 data:
-  name: remi-php
-  stream: @VERSION@
+  name: php
+  stream: remi-@VERSION@
   version: @DATE@
   context: 00000000
   arch: @ARCH@
   summary: PHP scripting language
   description: >-
-    php @VERSION@ module
+    Alternative php @VERSION@ module.
+    The remi-@VERSION@ stream provides more recent versions
+    and more packages than default @VERSION@ stream.
   license:
     module:
     - GPLv2+
@@ -30,7 +32,7 @@ data:
   - buildrequires:
       platform: [@DIST@]
     requires:
-      platform: [@DIST@]
+@DEPS@
   references:
     documentation: http://php.net/
     tracker: https://bugs.php.net/
@@ -63,12 +65,6 @@ data:
   api:
     rpms:
     - php-fpm
-  components:
-    rpms:
-      php:
-        rationale: Module API.
-      php-pecl-zip:
-        rationale: ZIP extension
   artifacts:
     rpms:
 
@@ -79,7 +75,7 @@ $template_glpi = <<< EOT
 document: modulemd
 version: 2
 data:
-  name: remi-glpi
+  name: glpi
   stream: @VERSION@
   version: @DATE@
   context: 00000000
@@ -96,7 +92,7 @@ data:
   - buildrequires:
       platform: [@DIST@]
     requires:
-      platform: [@DIST@]
+@DEPS@
   references:
     documentation: https://glpi-project.org/
     tracker: https://github.com/glpi-project/glpi/issues
@@ -107,10 +103,6 @@ data:
   api:
     rpms:
     - glpi
-  components:
-    rpms:
-      glpi:
-        rationale: Module API.
   artifacts:
     rpms:
 
@@ -121,16 +113,16 @@ $defaults = <<< EOT
 document: modulemd-defaults
 version: 1
 data:
-  module: remi-php
+  module: php
   profiles:
-    7.2: [default]
-    7.3: [default]
+    remi-7.2: [default]
+    remi-7.3: [default]
 ...
 ---
 document: modulemd-defaults
 version: 1
 data:
-  module: remi-glpi
+  module: glpi
   profiles:
     9.2: [default]
     9.3: [default]
@@ -159,10 +151,18 @@ function findPackages($from, $dest, $pat) {
 	return $rpms;
 }
 
-function genModule($srce, $dest, $pat, $ver, $arch, $dist, $template) {
+function genModule($srce, $dest, $pat, $ver, $arch, $deps, $template) {
 
 	$rpms = findPackages($srce, $dest, $pat);
-	$mod = str_replace(['@VERSION@', '@ARCH@', "@DATE@", "@DIST@"], [$ver, $arch, date("YmdHis"), $dist], $template);
+	$deptxt = '';
+	foreach($deps as $n => $v) {
+		$deptxt .= ($deptxt ? "\n" : '') . "      $n: [$v]";
+	}
+	$mod = str_replace(
+		['@VERSION@', '@ARCH@', "@DATE@",       "@DIST@",         "@DEPS@"], 
+		[$ver,        $arch,    date("YmdHis"), $deps['platform'], $deptxt], 
+		$template
+	);
 	foreach($rpms as $rpm) {
 		$mod .= "    - $rpm\n";
 	}
@@ -191,23 +191,38 @@ echo "  in $data.$arch\n";
 chdir(__DIR__);
 }
 
-$dest = 'fedora/29/modular/x86_64';
-echo "Populate $dest\n";
-cleanup($dest);
-$mod  = genModule('fedora/29/remi/x86_64',   $dest, 'php-*7.2*.rpm', '7.2', 'x86_64', 'f29', $template_php);
-$mod .= genModule('fedora/29/php73/x86_64',  $dest, '*.rpm',         '7.3', 'x86_64', 'f29', $template_php);
-$mod .= genModule('fedora/29/glpi92/x86_64', $dest, '*.rpm',         '9.2', 'x86_64', 'f29', $template_glpi);
-$mod .= genModule('fedora/29/glpi93/x86_64', $dest, '*.rpm',         '9.3', 'x86_64', 'f29', $template_glpi);
-$mod .= $defaults;
-createRepo($dest, $mod);
-
-$dest = 'fedora/29/modular/i386';
-echo "Populate $dest\n";
-cleanup($dest);
-$mod  = genModule('fedora/29/remi/i386',   $dest, 'php-*7.2*.rpm', '7.2', 'i386', 'f29', $template_php);
-$mod .= genModule('fedora/29/php73/i386',  $dest, '*.rpm',         '7.3', 'i386', 'f29', $template_php);
-$mod .= genModule('fedora/29/glpi92/i386', $dest, '*.rpm',         '9.2', 'i386', 'f29', $template_glpi);
-$mod .= genModule('fedora/29/glpi93/i386', $dest, '*.rpm',         '9.3', 'i386', 'f29', $template_glpi);
-$mod .= $defaults;
-createRepo($dest, $mod);
 
+if (count($_SERVER['argv'])<2 || in_array('f29', $_SERVER['argv'])) {
+	$dest = 'fedora/29/modular/x86_64';
+	echo "Populate $dest\n";
+	cleanup($dest);
+	$deps = ['platform' => 'f29'];
+	$mod  = genModule('fedora/29/remi/x86_64',   $dest, 'php-*7.2*.rpm', '7.2', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/29/php73/x86_64',  $dest, '*.rpm',         '7.3', 'x86_64', $deps, $template_php);
+	$mod .= genModule('fedora/29/glpi92/x86_64', $dest, '*.rpm',         '9.2', 'x86_64', $deps, $template_glpi);
+	$mod .= genModule('fedora/29/glpi93/x86_64', $dest, '*.rpm',         '9.3', 'x86_64', $deps, $template_glpi);
+	$mod .= $defaults;
+	createRepo($dest, $mod);
+
+	$dest = 'fedora/29/modular/i386';
+	echo "Populate $dest\n";
+	cleanup($dest);
+	$deps = ['platform' => 'f29'];
+	$mod  = genModule('fedora/29/remi/i386',   $dest, 'php-*7.2*.rpm', '7.2', 'i386', $deps, $template_php);
+	$mod .= genModule('fedora/29/php73/i386',  $dest, '*.rpm',         '7.3', 'i386', $deps, $template_php);
+	$mod .= genModule('fedora/29/glpi92/i386', $dest, '*.rpm',         '9.2', 'i386', $deps, $template_glpi);
+	$mod .= genModule('fedora/29/glpi93/i386', $dest, '*.rpm',         '9.3', 'i386', $deps, $template_glpi);
+	$mod .= $defaults;
+	createRepo($dest, $mod);
+}
+
+if (count($_SERVER['argv'])<2 || in_array('el8', $_SERVER['argv'])) {
+	$dest = 'enterprise/8/modular/x86_64';
+	echo "Populate $dest\n";
+	cleanup($dest);
+	$deps = ['platform' => 'el8', 'nginx' => '1.14', 'httpd' => '2.4'];
+	$mod  = genModule('enterprise/8/php72/x86_64',  $dest, '*.rpm',         '7.2', 'x86_64', $deps, $template_php);
+	$mod .= genModule('enterprise/8/php73/x86_64',  $dest, '*.rpm',         '7.3', 'x86_64', $deps, $template_php);
+	$mod .= $defaults;
+	createRepo($dest, $mod);
+}