From 9d665925ca46fee335ae793a30cc1dfceee58dfd Mon Sep 17 00:00:00 2001 From: Alex Kretzschmar Date: Wed, 17 Jun 2015 14:58:49 +0100 Subject: [PATCH] Modified config to support new Targets location properly --- Dockerfile | 1 + config | 7 +++++++ init/11_link_config.sh | 4 ---- 3 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 config delete mode 100644 init/11_link_config.sh diff --git a/Dockerfile b/Dockerfile index db4ecba..277f24f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,6 +23,7 @@ ADD config.d/ /etc/smokeping/config.d/ ADD init/ /etc/my_init.d/ ADD services/ /etc/service/ ADD Targets /tmp/Targets +ADD config /etc/smokeping/config RUN chmod -v +x /etc/service/*/run RUN chmod -v +x /etc/my_init.d/*.sh RUN mkdir /var/run/smokeping && mkdir /data diff --git a/config b/config new file mode 100644 index 0000000..f88a038 --- /dev/null +++ b/config @@ -0,0 +1,7 @@ +@include /etc/smokeping/config.d/General +@include /etc/smokeping/config.d/Alerts +@include /etc/smokeping/config.d/Database +@include /etc/smokeping/config.d/Presentation +@include /etc/smokeping/config.d/Probes +@include /etc/smokeping/config.d/Slaves +@include /config/Targets diff --git a/init/11_link_config.sh b/init/11_link_config.sh deleted file mode 100644 index bfba79a..0000000 --- a/init/11_link_config.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -rm /etc/smokeping/config.d/Targets -ln -s /config/Targets /etc/smokeping/config.d/Targets \ No newline at end of file