security-polices: Create a system policy

[people/ms/network.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index acf5a718f3b25265f1a291169ca04ceb2256220b..560b65c9e98aefd0f6042a0dd8582121498e69b0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,6 +32,7 @@ bashcompletiondir= $(datadir)/bash-completion/completions
 libexecdir       = $(prefix)/lib
 pkgconfigdatadir = $(datadir)/pkgconfig
 pppdir           = $(sysconfdir)/ppp
+systemconfigdir  = $(datadir)/network
 sysctldir        = $(prefix)/lib/sysctl.d
 tmpfilesdir      = $(prefix)/lib/tmpfiles.d
 udevrulesdir     = $(udevdir)/rules.d
@@ -81,8 +82,9 @@ AM_V_XSLT_0 = @echo "  XSLT    " $@;
 # ------------------------------------------------------------------------------
 
 dist_doc_DATA = \
-       COPYING \
-       README
+       README \
+       docs/CODING_STYLE \
+       docs/COPYING
 
 dist_sbin_SCRIPTS = \
        src/dhclient-script \
@@ -114,13 +116,14 @@ dist_network_SCRIPTS = \
        src/functions/functions.constants \
        src/functions/functions.constants-firewall \
        src/functions/functions.db \
+       src/functions/functions.description \
        src/functions/functions.device \
        src/functions/functions.dhclient \
        src/functions/functions.dhcpd \
        src/functions/functions.distro \
        src/functions/functions.dns \
        src/functions/functions.dummy \
-       src/functions/functions.ethernet \
+       src/functions/functions.editor \
        src/functions/functions.firewall \
        src/functions/functions.firewall-policy \
        src/functions/functions.firewall-zones \
@@ -145,7 +148,6 @@ dist_network_SCRIPTS = \
        src/functions/functions.ppp \
        src/functions/functions.pppoe-server \
        src/functions/functions.radvd \
-       src/functions/functions.red \
        src/functions/functions.route \
        src/functions/functions.routing \
        src/functions/functions.serial \
@@ -158,6 +160,7 @@ dist_network_SCRIPTS = \
        src/functions/functions.usb \
        src/functions/functions.util \
        src/functions/functions.vlan \
+       src/functions/functions.vpn-security-policies \
        src/functions/functions.wireless \
        src/functions/functions.wpa_supplicant \
        src/functions/functions.zone \
@@ -194,10 +197,9 @@ INSTALL_EXEC_HOOKS += bridge-stp-install-hook
 UNINSTALL_EXEC_HOOKS += bridge-stp-uninstall-hook
 
 dist_hooks_configs_SCRIPTS = \
-       src/hooks/configs/ipv4-dhcp \
+       src/hooks/configs/dhcp \
        src/hooks/configs/ipv4-static \
        src/hooks/configs/ipv6-auto \
-       src/hooks/configs/ipv6-dhcp \
        src/hooks/configs/ipv6-static \
        src/hooks/configs/pppoe-server
 
@@ -272,6 +274,15 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 
+systemconfig_vpndir = $(systemconfigdir)/vpn
+
+dist_systemconfig_vpn_security_policies_DATA = \
+       config/vpn/security-policies/system
+
+systemconfig_vpn_security_policiesdir = $(systemconfig_vpndir)/security-policies
+
+# ------------------------------------------------------------------------------
+
 dist_sysctl_DATA = \
        src/sysctl/network.conf
 
@@ -331,6 +342,8 @@ INSTALL_DIRS += \
 MANPAGES = \
        man/firewall-settings.8 \
        man/network.8 \
+       man/network-color.8 \
+       man/network-description.8 \
        man/network-device.8 \
        man/network-dhcp.8 \
        man/network-dns-server.8 \
@@ -340,6 +353,7 @@ MANPAGES = \
        man/network-port-batman-adv-port.8 \
        man/network-quick-start.8 \
        man/network-route.8 \
+       man/network-route-static.8 \
        man/network-settings.8 \
        man/network-zone.8 \
        man/network-zone-6to4-tunnel.8 \
@@ -445,7 +459,7 @@ TESTS = \
        test/load-library \
        test/functions/ip/ip_detect_protocol \
        test/functions/ip/ip_get_prefix \
-       test/functions/ip/ip_is_network \
+       test/functions/ip/ip_net_is_valid \
        test/functions/ip/ip_is_valid \
        test/functions/ip/ip_network_is_subnet_of \
        test/functions/ip/ip_prefix_is_valid \