Ralf S. Engelschall пре 11 година
родитељ
комит
2baf644b09
2 измењених фајлова са 13 додато и 11 уклоњено
  1. 3 2
      confd/confd.spec
  2. 10 9
      confd/confd.toml

+ 3 - 2
confd/confd.spec

@@ -79,7 +79,8 @@ PreReq:       OpenPKG, openpkg >= 20120101, etcd
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/sbin \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
-        $RPM_BUILD_ROOT%{l_prefix}/etc/confd/conf.d/template \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/confd/conf.d \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/confd/templates \
         $RPM_BUILD_ROOT%{l_prefix}/var/confd/run \
         $RPM_BUILD_ROOT%{l_prefix}/var/confd/log \
         $RPM_BUILD_ROOT%{l_prefix}/var/confd/out
@@ -90,7 +91,7 @@ PreReq:       OpenPKG, openpkg >= 20120101, etcd
     %{l_shtool} install -c -m 644 %{l_value -s -a} \
         %{SOURCE example.toml} $RPM_BUILD_ROOT%{l_prefix}/etc/confd/conf.d/
     %{l_shtool} install -c -m 644 %{l_value -s -a} \
-        %{SOURCE example.conf.tmpl} $RPM_BUILD_ROOT%{l_prefix}/etc/confd/conf.d/template/
+        %{SOURCE example.conf.tmpl} $RPM_BUILD_ROOT%{l_prefix}/etc/confd/templates/
     %{l_shtool} install -c -m 755 %{l_value -s -a} \
         %{SOURCE rc.confd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \

+ 10 - 9
confd/confd.toml

@@ -3,15 +3,16 @@
 ##
 
 [confd]
-verbose     = true
+verbose       = true
 
-backend     = "etcd"
-etcd_nodes  = [ "http://127.0.0.1:4001" ]
-etcd_scheme = "http"
-client_cert = "@l_prefix@/etc/x509/example-client.crt.pem"
-client_key  = "@l_prefix@/etc/x509/example-client.key.pem"
-prefix      = "/"
+backend       = "etcd"
+etcd_nodes    = [ "http://127.0.0.1:4001" ]
+etcd_scheme   = "http"
+prefix        = "/"
 
-confdir     = "@l_prefix@/etc/confd/confd.d"
-interval    = 600
+# client_cert = "@l_prefix@/etc/x509/example-client.crt.pem"
+# client_key  = "@l_prefix@/etc/x509/example-client.key.pem"
+
+confdir       = "@l_prefix@/etc/confd"
+interval      = 10