Comps patch: More changes for Fedora Server 21

[Miloslav Trmač <mitr@xxxxxxxxxx>]

Hello,

The attached patch creates a Fedora Server product environment. In Fedora Server, this environment will be used by default, and cause the fedora-product-server package to be installed, thus allowing us to activate other product-specific defaults (e.g. presets). Other Fedora products won’t include the fedora-product-server package, which will cause “server-product-environment” to be dropped from their versions of comps; so they are not affected by this patch.

(Completely untested—is there an easy way to have pungi use a different comps location?)
    Mirek

From 81da62c09b4dfc0b16d9930ef728b89e0638ec50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= <mitr@xxxxxxxxxx>
Date: Fri, 11 Jul 2014 22:41:18 +0200
Subject: [PATCH] =?UTF-8?q?Create=20a=20=E2=80=9CFedora=20Server=E2=80=9D?=
 =?UTF-8?q?=20product=20environment?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

At this point only pulling in fedora-release-server; the different
firewalld and preset are not yet applied by this.
---
 comps-f21.xml.in | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 comps-f22.xml.in | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 100 insertions(+)

diff --git a/comps-f21.xml.in b/comps-f21.xml.in
index 3430c30..b6f209d 100644
--- a/comps-f21.xml.in
+++ b/comps-f21.xml.in
@@ -5354,6 +5354,16 @@
     </packagelist>
   </group>
   <group>
+    <id>server-product</id>
+    <_name>Fedora Server product core</_name>
+    <_description>Packages mandatory for the server product.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">fedora-release-server</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>simplified-chinese-support</id>
     <_name>Simplified Chinese Support</_name>
     <_description/>
@@ -6571,6 +6581,7 @@
     </optionlist>
   </environment>
   <environment>
+    <!-- Please keep this mostly in sync with fedora-server-environment. -->
     <id>infrastructure-server-environment</id>
     <_name>Infrastructure Server</_name>
     <_description>Server for operating network infrastructure services.</_description>
@@ -6602,6 +6613,45 @@
     </optionlist>
   </environment>
   <environment>
+    <!-- Intended only for the Fedora Server product; other products will not
+         show this because they donâ??t include the fedora-release-server
+         package.  Please keep this mostly in sync with
+         infrastructure-server-environment. -->
+    <id>server-product-environment</id>
+    <_name>Fedora Server</_name>
+    <!-- Should eventually say â??with a web UI accessible right after installationâ??
+	 or something else to differentiate from
+	 infrastructure-server-environment. -->
+    <_description>An integrated, easier to manage server.</_description>
+    <display_order>1</display_order>
+    <grouplist>
+      <groupid>server-product</groupid>
+      <groupid>standard</groupid>
+      <groupid>core</groupid>
+      <groupid>hardware-support</groupid>
+      <groupid>headless-management</groupid>
+      <groupid>container-management</groupid>
+    </grouplist>
+    <optionlist>
+      <groupid>dogtag</groupid>
+      <groupid>directory-server</groupid>
+      <groupid>dns-server</groupid>
+      <groupid>freeipa-server</groupid>
+      <groupid>ftp-server</groupid>
+      <groupid>guest-agents</groupid>
+      <groupid>ha</groupid>
+      <groupid>load-balancer</groupid>
+      <groupid>mail-server</groupid>
+      <groupid>mysql</groupid>
+      <groupid>network-server</groupid>
+      <groupid>printing</groupid>
+      <groupid>smb-server</groupid>
+      <groupid>sql-server</groupid>
+      <groupid>virtualization</groupid>
+      <groupid>web-server</groupid>
+    </optionlist>
+  </environment>
+  <environment>
     <id>basic-desktop-environment</id>
     <_name>Basic Desktop</_name>
     <_description>X Window System with a choice of window manager.</_description>
diff --git a/comps-f22.xml.in b/comps-f22.xml.in
index 3430c30..b6f209d 100644
--- a/comps-f22.xml.in
+++ b/comps-f22.xml.in
@@ -5354,6 +5354,16 @@
     </packagelist>
   </group>
   <group>
+    <id>server-product</id>
+    <_name>Fedora Server product core</_name>
+    <_description>Packages mandatory for the server product.</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq type="mandatory">fedora-release-server</packagereq>
+    </packagelist>
+  </group>
+  <group>
     <id>simplified-chinese-support</id>
     <_name>Simplified Chinese Support</_name>
     <_description/>
@@ -6571,6 +6581,7 @@
     </optionlist>
   </environment>
   <environment>
+    <!-- Please keep this mostly in sync with fedora-server-environment. -->
     <id>infrastructure-server-environment</id>
     <_name>Infrastructure Server</_name>
     <_description>Server for operating network infrastructure services.</_description>
@@ -6602,6 +6613,45 @@
     </optionlist>
   </environment>
   <environment>
+    <!-- Intended only for the Fedora Server product; other products will not
+         show this because they donâ??t include the fedora-release-server
+         package.  Please keep this mostly in sync with
+         infrastructure-server-environment. -->
+    <id>server-product-environment</id>
+    <_name>Fedora Server</_name>
+    <!-- Should eventually say â??with a web UI accessible right after installationâ??
+	 or something else to differentiate from
+	 infrastructure-server-environment. -->
+    <_description>An integrated, easier to manage server.</_description>
+    <display_order>1</display_order>
+    <grouplist>
+      <groupid>server-product</groupid>
+      <groupid>standard</groupid>
+      <groupid>core</groupid>
+      <groupid>hardware-support</groupid>
+      <groupid>headless-management</groupid>
+      <groupid>container-management</groupid>
+    </grouplist>
+    <optionlist>
+      <groupid>dogtag</groupid>
+      <groupid>directory-server</groupid>
+      <groupid>dns-server</groupid>
+      <groupid>freeipa-server</groupid>
+      <groupid>ftp-server</groupid>
+      <groupid>guest-agents</groupid>
+      <groupid>ha</groupid>
+      <groupid>load-balancer</groupid>
+      <groupid>mail-server</groupid>
+      <groupid>mysql</groupid>
+      <groupid>network-server</groupid>
+      <groupid>printing</groupid>
+      <groupid>smb-server</groupid>
+      <groupid>sql-server</groupid>
+      <groupid>virtualization</groupid>
+      <groupid>web-server</groupid>
+    </optionlist>
+  </environment>
+  <environment>
     <id>basic-desktop-environment</id>
     <_name>Basic Desktop</_name>
     <_description>X Window System with a choice of window manager.</_description>
-- 
1.8.3.1

-- 
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/devel
Fedora Code of Conduct: http://fedoraproject.org/code-of-conduct