Merge pull request #36 from jimklimov/czmq4

Update czmq4 branch with recent changes from master
42ity · May 26, 2017 · 2da011b · 2da011b
2 parents feca741 + 3d7dad8
commit 2da011b
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 20 deletions.
diff --git a/builds/check_zproject/ci_build.sh b/builds/check_zproject/ci_build.sh
@@ -12,7 +12,7 @@ git clone --quiet --depth 1 https://github.com/zeromq/libzmq.git libzmq
 ### NOTE: Manual edit
 case "$CI_CZMQ_VER" in
 3)
-git clone --quiet -b v3.0.2 --depth 1 https://github.com/42ity/czmq.git czmq
+git clone --quiet --depth 1 -b v3.0.2 https://github.com/42ity/czmq.git czmq
 ;;
 4|*)
 git clone --quiet --depth 1 https://github.com/zeromq/czmq.git czmq

diff --git a/builds/valgrind/ci_build.sh b/builds/valgrind/ci_build.sh
@@ -40,7 +40,7 @@ cd ..
 ### NOTE: Manual edit
 case "$CI_CZMQ_VER" in
 3)
-git clone --quiet -b v3.0.2 --depth 1 https://github.com/42ity/czmq.git czmq.git
+git clone --quiet --depth 1 -b v3.0.2 https://github.com/42ity/czmq.git czmq.git
 ;;
 4|*)
 git clone --quiet --depth 1 https://github.com/zeromq/czmq.git czmq.git

diff --git a/ci_build.sh b/ci_build.sh
@@ -213,7 +213,7 @@ if [ "$BUILD_TYPE" == "default" ] || [ "$BUILD_TYPE" == "default-Werror" ] || [
 ### NOTE: Manual edit
 case "$CI_CZMQ_VER" in
 3)
-        $CI_TIME git clone --quiet -b v3.0.2 --depth 1 https://github.com/42ity/czmq.git czmq
+        $CI_TIME git clone --quiet --depth 1 -b v3.0.2 https://github.com/42ity/czmq.git czmq
 ;;
 4|*)
         $CI_TIME git clone --quiet --depth 1 https://github.com/zeromq/czmq.git czmq

diff --git a/install.xml b/install.xml
@@ -6,7 +6,7 @@ Installation model
     name - file name
 
     2. type
-    * systemd-tmpfiles  - install $(project.name) to /usr/lib/systemd/tmpfiles.d/
+    * systemd-tmpfiles  - install $(project.name) to /usr/lib/tmpfiles.d/
      -->
 
 <install>

diff --git a/src/fty-metric-composite-configurator.service.in b/src/fty-metric-composite-configurator.service.in
@@ -7,13 +7,18 @@ PartOf=bios.target
 [Service]
 Type=simple
 User=bios
-EnvironmentFile=-/usr/share/bios/etc/default/bios
-EnvironmentFile=-/usr/share/bios/etc/default/fty__%n.conf
-EnvironmentFile=-/etc/default/bios
-EnvironmentFile=-/etc/default/fty__fty-metric-composite__%i.conf
-Environment="prefix=@prefix@"
-ExecStart=@prefix@/bin/fty-metric-composite-configurator 
 Restart=always
+EnvironmentFile=-@prefix@/share/bios/etc/default/bios
+EnvironmentFile=-@prefix@/share/bios/etc/default/bios__%n.conf
+EnvironmentFile=-@prefix@/share/fty/etc/default/fty
+EnvironmentFile=-@prefix@/share/fty/etc/default/fty__%n.conf
+EnvironmentFile=-@sysconfdir@/default/bios
+EnvironmentFile=-@sysconfdir@/default/bios__%n.conf
+EnvironmentFile=-@sysconfdir@/default/fty
+EnvironmentFile=-@sysconfdir@/default/fty__%n.conf
+EnvironmentFile=-@sysconfdir@/default/fty__fty-metric-composite__%i.conf
+Environment="prefix=@prefix@"
+ExecStart=@prefix@/bin/fty-metric-composite-configurator
 
 [Install]
 WantedBy=bios.target
diff --git a/src/fty-metric-composite.conf b/src/fty-metric-composite.conf
@@ -1,3 +1,3 @@
-# create runtime directories for bios-agent-rt
-d /var/lib/bios/composite-metrics 0755 bios root
-x /var/lib/bios/composite-metrics/*
+# create runtime directories for fty-metric-composite
+d /var/lib/fty/fty-metric-composite 0755 bios root
+x /var/lib/fty/fty-metric-composite/*
diff --git a/src/fty-metric-composite@.service.in b/src/fty-metric-composite@.service.in
@@ -8,11 +8,18 @@ PartOf=bios.target
 [Service]
 Type=simple
 User=bios
-EnvironmentFile=-/usr/share/bios/etc/default/bios
-EnvironmentFile=-/usr/share/bios/etc/default/fty__%n.conf
-EnvironmentFile=-/etc/default/bios
-EnvironmentFile=-/etc/default/fty__fty-metric-composite__%i.conf
-ExecStart=@prefix@/bin/fty-metric-composite /var/lib/bios/composite-metrics/%i.cfg
+Restart=always
+EnvironmentFile=-@prefix@/share/bios/etc/default/bios
+EnvironmentFile=-@prefix@/share/bios/etc/default/bios__%n.conf
+EnvironmentFile=-@prefix@/share/fty/etc/default/fty
+EnvironmentFile=-@prefix@/share/fty/etc/default/fty__%n.conf
+EnvironmentFile=-@sysconfdir@/default/bios
+EnvironmentFile=-@sysconfdir@/default/bios__%n.conf
+EnvironmentFile=-@sysconfdir@/default/fty
+EnvironmentFile=-@sysconfdir@/default/fty__%n.conf
+EnvironmentFile=-@sysconfdir@/default/fty__fty-metric-composite__%i.conf
+Environment="prefix=@prefix@"
+ExecStart=@prefix@/bin/fty-metric-composite /var/lib/fty/fty-metric-composite/%i.cfg
 Restart=always
 
 [Install]

diff --git a/src/fty_metric_composite_configurator.cc b/src/fty_metric_composite_configurator.cc
@@ -34,8 +34,8 @@
 
 static const char *AGENT_NAME = "fty-metric-composite-configurator";
 static const char *ENDPOINT = "ipc://@/malamute";
-static const char *DIRECTORY = "/var/lib/bios/composite-metrics";
-static const char *STATE_FILE = "/var/lib/bios/composite-metrics/configurator_state_file";
+static const char *DIRECTORY = "/var/lib/fty/fty-metric-composite";
+static const char *STATE_FILE = "/var/lib/fty/fty-metric-composite/configurator_state_file";
 
 #define DEFAULT_LOG_LEVEL LOG_WARNING