diff --git a/conf.d/mixin-alt-server.mk b/conf.d/mixin-alt-server.mk index 71645078..56809d84 100644 --- a/conf.d/mixin-alt-server.mk +++ b/conf.d/mixin-alt-server.mk @@ -1,5 +1,5 @@ mixin/alt-server: server_groups = $(addprefix centaurus/,\ - 10-alterator 20-server-apps 50-freeipa 70-dev 90-docs sambaDC buildsystem dhcp-server-a diag-tools dns-server-a ftp-server-a mail-server-a mediawiki owncloud domain-server freeipa-client nm-daemon) + 10-alterator 20-server-apps 50-freeipa 70-dev 90-docs sambaDC buildsystem dhcp-server-a diag-tools dns-server-a ftp-server-a mail-server-a mediawiki owncloud domain-server freeipa-client nm-daemon openuds openuds-tunnel admc) mixin/alt-server: +installer +systemd \ use/branding/notes use/syslinux/ui/gfxboot \ diff --git a/pkg.in/groups/centaurus/openuds-tunnel.directory b/pkg.in/groups/centaurus/openuds-tunnel.directory new file mode 100644 index 00000000..b0e52a70 --- /dev/null +++ b/pkg.in/groups/centaurus/openuds-tunnel.directory @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Directory +Name=OpenUDS VDS tunneling +X-Alterator-PackageList=centaurus/openuds-tunnel +X-Alterator-Required=no +X-Alterator-Parent=centaurus/20-server-apps +X-Alterator-Conflicts=centaurus/openuds +Name[ru_RU]=Сервер туннелирования виртуальных рабочих столов OpenUDS +Categories=Server;Networking + diff --git a/pkg.in/groups/centaurus/openuds.directory b/pkg.in/groups/centaurus/openuds.directory index c73fa78c..704560ac 100644 --- a/pkg.in/groups/centaurus/openuds.directory +++ b/pkg.in/groups/centaurus/openuds.directory @@ -4,6 +4,7 @@ Type=Directory Name=OpenUDS virtual desktop server X-Alterator-PackageList=centaurus/openuds X-Alterator-Required=no +X-Alterator-Conflicts=centaurus/openuds-tunnel X-Alterator-Parent=centaurus/20-server-apps Name[ru_RU]=Сервер виртуальных рабочих столов OpenUDS Categories=Server;Networking diff --git a/pkg.in/lists/centaurus/openuds b/pkg.in/lists/centaurus/openuds index a93f42b2..69c9dfcd 100644 --- a/pkg.in/lists/centaurus/openuds +++ b/pkg.in/lists/centaurus/openuds @@ -1,2 +1 @@ openuds-server-nginx -openuds-tunnel diff --git a/pkg.in/lists/centaurus/openuds-tunnel b/pkg.in/lists/centaurus/openuds-tunnel new file mode 100644 index 00000000..6a7cb393 --- /dev/null +++ b/pkg.in/lists/centaurus/openuds-tunnel @@ -0,0 +1 @@ +openuds-tunnel