Move config hooks into a separate directory

diff --git a/Makefile.am b/Makefile.am
index 2b86f868598304191147d379c0d17c1bc9bf40c5..d49d37ba8b1df2910ca81c2e546361068747db58 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,6 +41,7 @@ helpersdir       = $(networkdir)/helpers
 macrosdir        = $(libexecdir)/firewall/macros
 
 hooksdir         = $(networkdir)/hooks
+hooks_configsdir = $(hooksdir)/configs
 hooks_portsdir   = $(hooksdir)/ports
 hooks_zonesdir   = $(hooksdir)/zones
 
@@ -179,6 +180,12 @@ bridge-stp-uninstall-hook:
 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/ipv6-static \
+       src/hooks/configs/ipv4-static \
+       src/hooks/configs/pppoe-server
+
 dist_hooks_ports_SCRIPTS = \
        src/hooks/ports/batman-adv \
        src/hooks/ports/batman-adv-port \

diff --git a/src/hooks/zones/bridge.configs/ipv4-dhcp b/src/hooks/configs/ipv4-dhcp
similarity index 100%
rename from src/hooks/zones/bridge.configs/ipv4-dhcp
rename to src/hooks/configs/ipv4-dhcp

diff --git a/src/hooks/zones/bridge.configs/ipv4-static b/src/hooks/configs/ipv4-static
similarity index 100%
rename from src/hooks/zones/bridge.configs/ipv4-static
rename to src/hooks/configs/ipv4-static

diff --git a/src/hooks/zones/bridge.configs/ipv6-static b/src/hooks/configs/ipv6-static
similarity index 100%
rename from src/hooks/zones/bridge.configs/ipv6-static
rename to src/hooks/configs/ipv6-static

diff --git a/src/hooks/zones/bridge.configs/pppoe-server b/src/hooks/configs/pppoe-server
similarity index 100%
rename from src/hooks/zones/bridge.configs/pppoe-server
rename to src/hooks/configs/pppoe-server

diff --git a/src/hooks/zones/wireless.configs/ipv4-dhcp b/src/hooks/zones/wireless.configs/ipv4-dhcp
deleted file mode 120000 (symlink)
index 5092ad1..0000000
--- a/src/hooks/zones/wireless.configs/ipv4-dhcp
+++ /dev/null
@@ -1 +0,0 @@
-../bridge.configs/ipv4-dhcp
\ No newline at end of file

diff --git a/src/hooks/zones/wireless.configs/ipv4-static b/src/hooks/zones/wireless.configs/ipv4-static
deleted file mode 120000 (symlink)
index d81c3af..0000000
--- a/src/hooks/zones/wireless.configs/ipv4-static
+++ /dev/null
@@ -1 +0,0 @@
-../bridge.configs/ipv4-static
\ No newline at end of file

diff --git a/src/hooks/zones/wireless.configs/ipv6-static b/src/hooks/zones/wireless.configs/ipv6-static
deleted file mode 120000 (symlink)
index dac121f..0000000
--- a/src/hooks/zones/wireless.configs/ipv6-static
+++ /dev/null
@@ -1 +0,0 @@
-../bridge.configs/ipv6-static
\ No newline at end of file