pkg.in, server: revamped server lists/groups

This has been long overdue: pretending that "http server" is an Apache2 with PHP5 was wrong for ages, and providing apache2/nginx, php5/php7 choice along with more databases was waiting for its user proposal. Follow these changes in server feature as well. Suggested-by: Altexander See-also: https://forum.altlinux.org/index.php?topic=40290

pkg.in, server: revamped server lists/groups
1cc3a2f1 · Michael Shigorin · 0c31b989 · 1cc3a2f1 · 1cc3a2f1 · 1cc3a2f1
Commit 1cc3a2f1 authored Dec 11, 2017 by Michael Shigorin
18 changed files
--- a/features.in/server/config.mk
+++ b/features.in/server/config.mk
@@ -41,9 +41,12 @@ use/server/groups/tools: use/server
 	@$(call add,MAIN_GROUPS,tools/tuning)

 use/server/groups/services: use/server
-	@$(call add,MAIN_GROUPS,server/dns server/http server/ftp server/kvm)
-	@$(call add,MAIN_GROUPS,server/dhcp server/mail server/mysql)
-	@$(call add,MAIN_GROUPS,server/pgsql)
+	@$(call add,MAIN_GROUPS,server/dhcp server/dns server/mail)
+	@$(call add,MAIN_GROUPS,server/apache2 server/nginx)
+	@$(call add,MAIN_GROUPS,server/mariadb server/pgsql)
+	@$(call add,MAIN_GROUPS,server/php5 server/php7)
+	@$(call add,MAIN_GROUPS,server/ftp server/rsync)
+	@$(call add,MAIN_GROUPS,server/kvm)

 use/server/groups/base: use/server/groups/tools use/server/groups/services; @:


--- a/pkg.in/groups/server/apache2.directory
+++ b/pkg.in/groups/server/apache2.directory
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=Apache Web Server
+X-Alterator-PackageList=server/apache2
+X-Alterator-Required=no
+X-Alterator-Conflicts=server/nginx
+Name[ru_RU]=Web-сервер Apache 2
+Categories=Server;Networking
+
--- a/pkg.in/groups/server/mariadb.directory
+++ b/pkg.in/groups/server/mariadb.directory
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=MariaDB Server (MySQL replacement)
+X-Alterator-PackageList=server/mariadb
+X-Alterator-Required=no
+X-Alterator-Conflicts=server/mysql
+Name[ru_RU]=Сервер MariaDB (замена MySQL)
+Categories=Server;Networking
+
--- a/pkg.in/groups/server/mysql.directory
+++ b/pkg.in/groups/server/mysql.directory
@@ -4,6 +4,7 @@ Type=Directory
 Name=MySQL Server
 X-Alterator-PackageList=server/mysql
 X-Alterator-Required=no
+X-Alterator-Conflicts=server/mariadb
 Name[ru_RU]=Сервер MySQL
 Categories=Server;Networking

--- a/pkg.in/groups/server/nginx.directory
+++ b/pkg.in/groups/server/nginx.directory
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=NGINX Web Server
+X-Alterator-PackageList=server/nginx
+X-Alterator-Required=no
+X-Alterator-Conflicts=server/apache2
+Name[ru_RU]=Web-сервер NGINX
+Categories=Server;Networking
+
--- a/pkg.in/groups/server/php5.directory
+++ b/pkg.in/groups/server/php5.directory
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=PHP 5 support
+X-Alterator-PackageList=server/php5
+X-Alterator-Required=no
+X-Alterator-Conflicts=server/php7
+Name[ru_RU]=Поддержка PHP 5
+Categories=Server;Networking
+
--- a/pkg.in/groups/server/php7.directory
+++ b/pkg.in/groups/server/php7.directory
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=PHP 7 support
+X-Alterator-PackageList=server/php7
+X-Alterator-Required=no
+X-Alterator-Conflicts=server/php5
+Name[ru_RU]=Поддержка PHP 7
+Categories=Server;Networking
+
--- a/pkg.in/groups/server/http.directory
+++ b/pkg.in/groups/server/http.directory
 [Desktop Entry]
 Encoding=UTF-8
 Type=Directory
-Name=LAMP Server (Apache, MySQL, PHP)
-X-Alterator-PackageList=server/http
+Name=Rsync Server
+X-Alterator-PackageList=server/rsync
 X-Alterator-Required=no
-Name[ru_RU]=Сервер LAMP (Apache, MySQL, PHP)
+Name[ru_RU]=Сервер rsync
 Categories=Server;Networking

--- a/pkg.in/groups/server/sqlite.directory
+++ b/pkg.in/groups/server/sqlite.directory
+[Desktop Entry]
+Encoding=UTF-8
+Type=Directory
+Name=SQLite Support
+Name[ru_RU]=Поддержка SQLite
+X-Alterator-PackageList=server/sqlite
+X-Alterator-Required=no
+Categories=Server;
+
--- a/pkg.in/lists/server/apache2
+++ b/pkg.in/lists/server/apache2
+apache2
+apache2-httpd-prefork
--- a/pkg.in/lists/server/mariadb
+++ b/pkg.in/lists/server/mariadb
+mariadb-backup
+mariadb-bench
+mariadb-client
+mariadb-server
+perl-DBD-mysql
+python-module-MySQLdb
--- a/pkg.in/lists/server/nginx
+++ b/pkg.in/lists/server/nginx
+nginx
+nginx-perl
--- a/pkg.in/lists/server/pgsql
+++ b/pkg.in/lists/server/pgsql
-postgresql9.5-server
-postgresql9.5-contrib
+postgresql10-server
+postgresql10-contrib
--- a/pkg.in/lists/server/pgsql-1C
+++ b/pkg.in/lists/server/pgsql-1C
-postgresql9.4-1C-server
+postgresql9.6-1C-server
--- a/pkg.in/lists/server/http
+++ b/pkg.in/lists/server/http
-apache2
 apache2-mod_php5
 php5
 php5-cgi
 php5-curl
 php5-dba
 php5-dom
-#php5-eaccelerator
 php5-exif
-#php5-facedetect
 php5-fileinfo
+php5-fpm-fcgi
 php5-gd2
-#php5-imagick2
 php5-imap
 php5-ldap
 php5-mbstring
@@ -23,7 +20,3 @@ php5-suhosin
 php5-xmlrpc
 php5-xsl
 php5-zip
-MySQL-bench
-MySQL-client
-MySQL-server-perl
-
--- a/pkg.in/lists/server/php7
+++ b/pkg.in/lists/server/php7
+apache2-mod_php7
+php7
+php7-curl
+php7-dba
+php7-dom
+php7-exif
+php7-fileinfo
+php7-fpm-fcgi
+php7-gd2
+php7-imap
+php7-ldap
+php7-mbstring
+php7-mcrypt
+php7-memcached
+php7-mysqlnd
+php7-pgsql
+php7-xmlrpc
+php7-xsl
+php7-zip
--- a/pkg.in/lists/server/rsync
+++ b/pkg.in/lists/server/rsync
+rsync-server
+xinetd
--- a/pkg.in/lists/server/sqlite
+++ b/pkg.in/lists/server/sqlite
+sqlite3