no pve, no more conflict between samba & sambaDC

203243ee · Anton V. Boyarshinov · Michael Shigorin · 7902508d · 203243ee · 203243ee
Commit 203243ee authored Jun 24, 2019 by Anton V. Boyarshinov Committed by Michael Shigorin May 22, 2020
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

alt-server.mk conf.d/alt-server.mk +4 -4

samba.directory pkg.in/groups/centaurus/samba.directory +0 -1

sambaDC.directory pkg.in/groups/centaurus/sambaDC.directory +0 -1

No files found.
--- a/conf.d/alt-server.mk
+++ b/conf.d/alt-server.mk
@@ -6,10 +6,10 @@ distro/alt-server: server_groups_x86 = $(addprefix centaurus/,\
        blogs emulators gnome-peer-to-peer freeipa-server freenx-server \
 	ipmi v12n-server netinst sogo virt-manager)
-ifeq (,$(filter-out x86_64,$(ARCH)))
+#ifeq (,$(filter-out x86_64,$(ARCH)))
-distro/alt-server: server_groups_x86_64 = $(addprefix centaurus/,\
+#distro/alt-server: server_groups_x86_64 = $(addprefix centaurus/,\
-        40-pve )
+#         )
-endif
+#endif
 # FIXME: generalize vm-profile
 distro/alt-server: distro/.base mixin/alt-server +efi +vmguest \

--- a/pkg.in/groups/centaurus/samba.directory
+++ b/pkg.in/groups/centaurus/samba.directory
@@ -2,7 +2,6 @@
 Encoding=UTF-8
 Type=Directory
 Name=Samba Server
-X-Alterator-Conflicts=centaurus/sambaDC
 X-Alterator-PackageList=centaurus/samba
 X-Alterator-Required=no
 X-Alterator-Parent=centaurus/20-server-apps

--- a/pkg.in/groups/centaurus/sambaDC.directory
+++ b/pkg.in/groups/centaurus/sambaDC.directory
@@ -3,7 +3,6 @@ Encoding=UTF-8
 Type=Directory
 Name=SambaDC Server (AD controller)
 X-Alterator-PackageList=centaurus/sambaDC
-X-Alterator-Conflicts=centaurus/samba-server centaurus/domain-server
 X-Alterator-Required=no
 X-Alterator-Parent=centaurus/20-server-apps
 Name[ru_RU]=Сервер SambaDC (контроллер AD)