From 70b7d2f35eabdf2b7589e27a7c711172f6db94b2 Mon Sep 17 00:00:00 2001 From: Alexey Shabalin Date: Wed, 24 Jul 2019 17:15:55 +0300 Subject: [PATCH] server-v: update network software --- conf.d/server-v.mk | 2 +- pkg.in/groups/server-v/apache2.directory | 9 +++++++++ pkg.in/groups/server-v/dhcp.directory | 8 ++++++++ pkg.in/groups/server-v/dns.directory | 10 ++++++++++ pkg.in/groups/server-v/nginx.directory | 10 ++++++++++ pkg.in/lists/network/apache2 | 7 +++++++ pkg.in/lists/network/dhcp | 1 + pkg.in/lists/network/dns | 3 +++ pkg.in/lists/network/nginx | 4 ++++ 9 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 pkg.in/groups/server-v/apache2.directory create mode 100644 pkg.in/groups/server-v/dhcp.directory create mode 100644 pkg.in/groups/server-v/dns.directory create mode 100644 pkg.in/groups/server-v/nginx.directory create mode 100644 pkg.in/lists/network/apache2 create mode 100644 pkg.in/lists/network/dhcp create mode 100644 pkg.in/lists/network/dns create mode 100644 pkg.in/lists/network/nginx diff --git a/conf.d/server-v.mk b/conf.d/server-v.mk index bb8fa5b6..94f0ed42 100644 --- a/conf.d/server-v.mk +++ b/conf.d/server-v.mk @@ -33,7 +33,7 @@ distro/server-v: container = $(addprefix server-v/,\ docker kubernetes rkt podman lxd) distro/server-v: network = $(addprefix server-v/,\ - bird haproxy keepalived openvswitch freeipa-client) + apache2 nginx bird dhcp dns haproxy keepalived openvswitch freeipa-client) distro/server-v: monitoring = $(addprefix server-v/,\ zabbix-agent telegraf prometheus-node_exporter monit collectd nagios-nrpe) diff --git a/pkg.in/groups/server-v/apache2.directory b/pkg.in/groups/server-v/apache2.directory new file mode 100644 index 00000000..e5ce450d --- /dev/null +++ b/pkg.in/groups/server-v/apache2.directory @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Directory +Name=Apache Web Server +Name[ru_RU]=Web-сервер Apache 2 +X-Alterator-PackageList=network/apache2 +X-Alterator-Required=no +X-Alterator-Conflicts=network/nginx +X-Alterator-Parent=server-v/500-network diff --git a/pkg.in/groups/server-v/dhcp.directory b/pkg.in/groups/server-v/dhcp.directory new file mode 100644 index 00000000..0d72d99e --- /dev/null +++ b/pkg.in/groups/server-v/dhcp.directory @@ -0,0 +1,8 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Directory +Name=DHCP Server +Name[ru_RU]=Сервер DHCP +X-Alterator-PackageList=network/dhcp +X-Alterator-Required=no +X-Alterator-Parent=server-v/500-network diff --git a/pkg.in/groups/server-v/dns.directory b/pkg.in/groups/server-v/dns.directory new file mode 100644 index 00000000..3590356e --- /dev/null +++ b/pkg.in/groups/server-v/dns.directory @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Directory +Name=DNS Server +Name[ru_RU]=Сервер DNS +X-Alterator-PackageList=network/dns +X-Alterator-Required=no +X-Alterator-Parent=server-v/500-network + + diff --git a/pkg.in/groups/server-v/nginx.directory b/pkg.in/groups/server-v/nginx.directory new file mode 100644 index 00000000..3dd7ad94 --- /dev/null +++ b/pkg.in/groups/server-v/nginx.directory @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Directory +Name=NGINX Web Server +Name[ru_RU]=Web-сервер NGINX +X-Alterator-PackageList=network/nginx +X-Alterator-Required=no +X-Alterator-Conflicts=network/apache2 +X-Alterator-Parent=server-v/500-network + diff --git a/pkg.in/lists/network/apache2 b/pkg.in/lists/network/apache2 new file mode 100644 index 00000000..e98cb797 --- /dev/null +++ b/pkg.in/lists/network/apache2 @@ -0,0 +1,7 @@ +apache2 +apache2-httpd-prefork +apache2-mod_http2 +apache2-mod_auth_gssapi +apache2-mod_ssl +apache2-mod_ldap +apache2-mod_wsgi-py3 diff --git a/pkg.in/lists/network/dhcp b/pkg.in/lists/network/dhcp new file mode 100644 index 00000000..00e2bede --- /dev/null +++ b/pkg.in/lists/network/dhcp @@ -0,0 +1 @@ +dhcp-server diff --git a/pkg.in/lists/network/dns b/pkg.in/lists/network/dns new file mode 100644 index 00000000..c0b6b7b2 --- /dev/null +++ b/pkg.in/lists/network/dns @@ -0,0 +1,3 @@ +bind +bind-control +bind-utils diff --git a/pkg.in/lists/network/nginx b/pkg.in/lists/network/nginx new file mode 100644 index 00000000..b06dcb70 --- /dev/null +++ b/pkg.in/lists/network/nginx @@ -0,0 +1,4 @@ +nginx +nginx-webapps +nginx-webapps-ssl +nginx-spnego