quagga: fix access rights, add more postinst

Add null conf files for protocols (allows tighter permissions
setting and sets some starting point for configuration in general),
fix permissions for log directory.

Signed-off-by: Roman I Khimov <khimov@altell.ru>

diff --git a/recipes/quagga/files/volatiles.03_quagga b/recipes/quagga/files/volatiles.03_quagga
index 672fec6..cfb896a 100644 (file)
--- a/recipes/quagga/files/volatiles.03_quagga
+++ b/recipes/quagga/files/volatiles.03_quagga
@@ -1,2 +1,3 @@
 # <type> <owner> <group> <mode> <path> <linksource>
 d quagga quagga 0755 /var/run/quagga none
+d quagga quagga 0755 /var/log/quagga none
\ No newline at end of file

diff --git a/recipes/quagga/quagga.inc b/recipes/quagga/quagga.inc
index 8d53ebc..3c25861 100644 (file)
--- a/recipes/quagga/quagga.inc
+++ b/recipes/quagga/quagga.inc
@@ -21,7 +21,7 @@ RDEPENDS_${PN}-watchquagga = "${PN}"
 # the "ip" command from busybox is not sufficient (flush by protocol flushes all routes)
 RDEPENDS_${PN}          += "iproute2"
 
-INC_PR = "r2"
+INC_PR = "r3"
 
 QUAGGASUBDIR = ""
 
@@ -117,11 +117,17 @@ INITSCRIPT_PARAMS_${PN}-watchquagga     = "defaults 90 10"
 
 # Add quagga's user and groups
 pkg_postinst_${PN} () {
+       set -e
         grep -q quagga: /etc/group || addgroup quagga
         grep -q quaggavty: /etc/group || addgroup quaggavty
         grep -q quagga: /etc/passwd || \
             adduser --disabled-password --home=/var/run/quagga/ --system \
-                    --ingroup quagga --no-create-home -g "Quagga routing suite" quagga                                            
+                    --ingroup quagga --no-create-home -g "Quagga routing suite" quagga
+       for f in bgpd isisd ospfd ripngd zebra ripd ospf6d; do touch /etc/quagga/$f.conf; done
+       chown quagga:quaggavty /etc/quagga
+       chown quagga:quagga /etc/quagga/*.conf
+       chmod 750 /etc/quagga
+       chown 640 /etc/quagga/*.conf
         /etc/init.d/populate-volatile.sh update
 }