Use the newly added INSTALL_CONF variable

SVN-Revision: 5980

diff --git a/admin/monit/Makefile b/admin/monit/Makefile
index 82a25be1e82462a953ef4cb4891877714eb6d311..cfb723074845bb23bfda32d96cfe15dde5239ddf 100644 (file)
--- a/admin/monit/Makefile
+++ b/admin/monit/Makefile
@@ -66,7 +66,7 @@ endef
 
 define Package/monit/install   
        $(INSTALL_DIR) $(1)/etc
-       install -m0600 $(PKG_BUILD_DIR)/monitrc $(1)/etc/
+       $(INSTALL_CONF) $(PKG_BUILD_DIR)/monitrc $(1)/etc/
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/monit.init $(1)/etc/init.d/monit
        $(INSTALL_DIR) $(1)/usr/sbin
@@ -75,7 +75,7 @@ endef
 
 define Package/monit-nossl/install
        $(INSTALL_DIR) $(1)/etc
-       install -m0600 $(PKG_BUILD_DIR)/monitrc $(1)/etc/
+       $(INSTALL_CONF) $(PKG_BUILD_DIR)/monitrc $(1)/etc/
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/monit.init $(1)/etc/init.d/monit
        $(INSTALL_DIR) $(1)/usr/sbin

diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index 6f3de4868cfb7270c52e3cf950761cbcda22560f..ea652f09a68d93ea6146daa653dcc35a9c145875 100644 (file)
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -455,7 +455,7 @@ endef
 
 define Package/asterisk-mysql/install
        $(INSTALL_DIR) $(1)/etc/asterisk
-       install -m0600 $(PKG_BUILD_DIR)/configs/cdr_mysql.conf.sample $(1)/etc/asterisk/cdr_mysql.conf
+       $(INSTALL_CONF) $(PKG_BUILD_DIR)/configs/cdr_mysql.conf.sample $(1)/etc/asterisk/cdr_mysql.conf
        $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/apps/app_sql_mysql.so $(1)/usr/lib/asterisk/modules/
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/cdr/cdr_mysql.so $(1)/usr/lib/asterisk/modules/
@@ -463,7 +463,7 @@ endef
 
 define Package/asterisk-pgsql/install
        $(INSTALL_DIR) $(1)/etc/asterisk
-       install -m0600 $(PKG_BUILD_DIR)/configs/cdr_pgsql.conf.sample $(1)/etc/asterisk/cdr_pgsql.conf
+       $(INSTALL_CONF) $(PKG_BUILD_DIR)/configs/cdr_pgsql.conf.sample $(1)/etc/asterisk/cdr_pgsql.conf
        $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/apps/app_sql_postgres.so $(1)/usr/lib/asterisk/modules/
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/cdr/cdr_pgsql.so $(1)/usr/lib/asterisk/modules/

diff --git a/net/ez-ipupdate/Makefile b/net/ez-ipupdate/Makefile
index 52c3f6d860c2ba674581f83f2ec704a916d8c833..2ec7f4adcde3658cb6908e268b3f401ce33e3393 100644 (file)
--- a/net/ez-ipupdate/Makefile
+++ b/net/ez-ipupdate/Makefile
@@ -43,7 +43,7 @@ define Package/ez-ipupdate/install
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/ez-ipupdate $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/etc
-       install -m0600 ./files/ez-ipupdate.conf $(1)/etc/
+       $(INSTALL_CONF) ./files/ez-ipupdate.conf $(1)/etc/
        $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
        $(INSTALL_BIN) ./files/ez-ipupdate.hotplug $(1)/etc/hotplug.d/iface/10-ez-ipupdate
 endef

diff --git a/net/knock/Makefile b/net/knock/Makefile
index 9d275da457b810b5b1359b6a496c08b28622ddfa..0433e7b365cf6297b84572ebc011d589b522d163 100644 (file)
--- a/net/knock/Makefile
+++ b/net/knock/Makefile
@@ -81,7 +81,7 @@ endef
 
 define Package/knockd/install
        $(INSTALL_DIR) $(1)/etc
-       install -m0600 $(PKG_INSTALL_DIR)/etc/knockd.conf $(1)/etc/
+       $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/knockd.conf $(1)/etc/
        $(INSTALL_DIR) $(1)/usr/sbin
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/knockd $(1)/usr/sbin/
 endef

diff --git a/net/mini_httpd/Makefile b/net/mini_httpd/Makefile
index 016484bcb7c8064fd29f2b1e601d5c5b0fdf1d3a..a93425e3898b38ace9cac6b8a99d6e23bb3b8aba 100644 (file)
--- a/net/mini_httpd/Makefile
+++ b/net/mini_httpd/Makefile
@@ -145,7 +145,7 @@ endef
 define Package/mini-httpd-matrixssl/install
        $(INSTALL_DIR) $(1)/etc
        $(INSTALL_DATA) ./files/mini_httpd-ssl.conf $(1)/etc/mini_httpd.conf
-       install -m0600 ./files/mini_httpd.pem $(1)/etc/mini_httpd.pem
+       $(INSTALL_CONF) ./files/mini_httpd.pem $(1)/etc/mini_httpd.pem
        $(INSTALL_DIR) $(1)/etc/default
        $(INSTALL_DATA) ./files/mini_httpd.default $(1)/etc/default/mini_httpd
        $(INSTALL_DIR) $(1)/etc/init.d
@@ -157,7 +157,7 @@ endef
 define Package/mini-httpd-openssl/install
        $(INSTALL_DIR) $(1)/etc
        $(INSTALL_DATA) ./files/mini_httpd-ssl.conf $(1)/etc/mini_httpd.conf
-       install -m0600 ./files/mini_httpd.pem $(1)/etc/mini_httpd.pem
+       $(INSTALL_CONF) ./files/mini_httpd.pem $(1)/etc/mini_httpd.pem
        $(INSTALL_DIR) $(1)/etc/default
        $(INSTALL_DATA) ./files/mini_httpd.default $(1)/etc/default/mini_httpd
        $(INSTALL_DIR) $(1)/etc/init.d

diff --git a/net/nsca/Makefile b/net/nsca/Makefile
index 59736ecb8603555e08f1a4b715b9ada101da345d..3fc3c4715c7420be836de20ddf5b3397283dfecd 100644 (file)
--- a/net/nsca/Makefile
+++ b/net/nsca/Makefile
@@ -48,7 +48,7 @@ endef
 
 define Package/send-nsca/install
        $(INSTALL_DIR) $(1)/etc
-       install -m0600 $(PKG_BUILD_DIR)/sample-config/send_nsca.cfg $(1)/etc/
+       $(INSTALL_CONF) $(PKG_BUILD_DIR)/sample-config/send_nsca.cfg $(1)/etc/
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/send_nsca $(1)/usr/sbin/
 endef

diff --git a/net/psybnc/Makefile b/net/psybnc/Makefile
index 3c35a504f825f9efc890d5e3fc7dcd8eadc7eb2a..d80d81e6dbddff3992f9bf69cb1c915fde167a71 100644 (file)
--- a/net/psybnc/Makefile
+++ b/net/psybnc/Makefile
@@ -48,7 +48,7 @@ define Package/psybnc/install
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/psybnc.sh $(1)/usr/sbin/psybnc
        $(INSTALL_DIR) $(1)/usr/share/psybnc
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/psybnc $(1)/usr/share/psybnc/
-       install -m0600 $(PKG_BUILD_DIR)/psybnc.conf $(1)/usr/share/psybnc/
+       $(INSTALL_CONF) $(PKG_BUILD_DIR)/psybnc.conf $(1)/usr/share/psybnc/
        $(INSTALL_DIR) $(1)/usr/share/psybnc/lang
        $(INSTALL_DATA) $(PKG_BUILD_DIR)/lang/english.lng $(1)/usr/share/psybnc/lang/
 endef

diff --git a/net/siproxd/Makefile b/net/siproxd/Makefile
index d4caa129a658f191109d2437d5578278329bfb60..17ed891cb4da1ce82d47a65cb71933caf8f48a65 100644 (file)
--- a/net/siproxd/Makefile
+++ b/net/siproxd/Makefile
@@ -48,7 +48,7 @@ define Package/siproxd/install
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/siproxd $(1)/usr/sbin/
        $(INSTALL_DIR) $(1)/etc
        $(INSTALL_DATA) $(PKG_BUILD_DIR)/doc/siproxd.conf.example $(1)/etc/siproxd.conf
-       install -m0600 $(PKG_BUILD_DIR)/doc/siproxd_passwd.cfg $(1)/etc/
+       $(INSTALL_CONF) $(PKG_BUILD_DIR)/doc/siproxd_passwd.cfg $(1)/etc/
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/siproxd.init $(1)/etc/init.d/siproxd
 endef

diff --git a/net/vpnc/Makefile b/net/vpnc/Makefile
index 2fac7e71f85563d67f881d99859fab9ffbb3a158..7f8b30edd571c652a9883fece5bc33a896c5304b 100644 (file)
--- a/net/vpnc/Makefile
+++ b/net/vpnc/Makefile
@@ -52,7 +52,7 @@ define Package/vpnc/install
                $(PKG_INSTALL_DIR)/usr/sbin/vpnc-disconnect \
                $(1)/usr/sbin/
        install -d -m0700 $(1)/etc/vpnc
-       install -m0600 $(PKG_INSTALL_DIR)/etc/vpnc/vpnc.conf $(1)/etc/vpnc/
+       $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/vpnc/vpnc.conf $(1)/etc/vpnc/
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/etc/vpnc/vpnc-script $(1)/etc/vpnc/
 endef
 

diff --git a/net/vtun/Makefile b/net/vtun/Makefile
index bf0f4ca0fd3f4c8171f8acd0c7ca2de7129a9d9c..e09251fa722f988bf370eaf77fc923d01a3e1d8a 100644 (file)
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@@ -49,7 +49,7 @@ endef
 
 define Package/vtun/install    
        $(INSTALL_DIR) $(1)/etc
-       install -m0600 $(PKG_BUILD_DIR)/vtund.conf $(1)/etc/
+       $(INSTALL_CONF) $(PKG_BUILD_DIR)/vtund.conf $(1)/etc/
        $(INSTALL_DIR) $(1)/usr/sbin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/vtund $(1)/usr/sbin/
 endef