From 9f7cdee108ab80bad08a07d347959c004a3bc91a Mon Sep 17 00:00:00 2001 From: aviau Date: Thu, 14 Aug 2014 20:56:44 -0400 Subject: [PATCH] Moved Dockerfile to root Change-Id: Ie4e4b14028aeeba58d20464fc9c5d02846b029ec --- tools/test_env/Dockerfile => Dockerfile | 12 ++++++------ Makefile | 2 +- .../etc/apache2/conf-enabled/influxdb.conf | 0 .../etc/apache2/sites-available/grafana.conf | 0 .../{test_env => docker}/etc/riemann/riemann.config | 0 .../etc/shinken/arbiters/arbiter-master.cfg | 0 .../etc/shinken/brokers/broker-master.cfg | 0 tools/{test_env => docker}/etc/shinken/certs/02.pem | 0 tools/{test_env => docker}/etc/shinken/certs/README | 0 tools/{test_env => docker}/etc/shinken/certs/ca.pem | 0 .../etc/shinken/certs/certindex.txt | 0 .../etc/shinken/certs/certindex.txt.attr | 0 .../etc/shinken/certs/certindex.txt.old | 0 .../etc/shinken/certs/client.pem | 0 .../etc/shinken/certs/demoCA/cacert.pem | 0 .../etc/shinken/certs/demoCA/careq.pem | 0 .../etc/shinken/certs/demoCA/crlnumber | 0 .../etc/shinken/certs/demoCA/index.txt | 0 .../etc/shinken/certs/demoCA/index.txt.attr | 0 .../etc/shinken/certs/demoCA/index.txt.attr.old | 0 .../etc/shinken/certs/demoCA/index.txt.old | 0 .../certs/demoCA/newcerts/EC5B5DDAD51BE4A8.pem | 0 .../certs/demoCA/newcerts/EC5B5DDAD51BE4A9.pem | 0 .../etc/shinken/certs/demoCA/private/cakey.pem | 0 .../etc/shinken/certs/demoCA/serial | 0 .../etc/shinken/certs/demoCA/serial.old | 0 tools/{test_env => docker}/etc/shinken/certs/serial | 0 .../etc/shinken/certs/serial.old | 0 .../etc/shinken/certs/server.cert | 0 .../etc/shinken/certs/server.key | 0 .../etc/shinken/certs/server.pem | 0 .../etc/shinken/certs/server.req | 0 .../etc/shinken/certs/shinken_openssl_cnf | 0 .../etc/shinken/commands/check_dig.cfg | 0 .../etc/shinken/commands/check_host_alive.cfg | 0 .../etc/shinken/commands/check_http_url.cfg | 0 .../etc/shinken/commands/check_nrpe.cfg | 0 .../etc/shinken/commands/check_nrpe_args.cfg | 0 .../etc/shinken/commands/check_ping.cfg | 0 .../etc/shinken/commands/check_snmp_service.cfg | 0 .../etc/shinken/commands/check_snmp_storage.cfg | 0 .../etc/shinken/commands/check_snmp_time.cfg | 0 .../etc/shinken/commands/check_tcp.cfg | 0 .../etc/shinken/commands/configuration-check.cfg | 0 .../etc/shinken/commands/detailled-host-by-email.cfg | 0 .../shinken/commands/detailled-service-by-email.cfg | 0 .../shinken/commands/notify-host-by-android-sms.cfg | 0 .../etc/shinken/commands/notify-host-by-email.cfg | 0 .../etc/shinken/commands/notify-host-by-xmpp.cfg | 0 .../commands/notify-service-by-android-sms.cfg | 0 .../etc/shinken/commands/notify-service-by-email.cfg | 0 .../etc/shinken/commands/notify-service-by-xmpp.cfg | 0 .../etc/shinken/commands/reload-shinken.cfg | 0 .../etc/shinken/commands/restart-shinken.cfg | 0 .../etc/shinken/contactgroups/admins.cfg | 0 .../etc/shinken/contactgroups/users.cfg | 0 .../etc/shinken/contacts/admin.cfg | 0 .../etc/shinken/daemons/brokerd.ini | 0 .../etc/shinken/daemons/pollerd.ini | 0 .../etc/shinken/daemons/reactionnerd.ini | 0 .../etc/shinken/daemons/receiverd.ini | 0 .../etc/shinken/daemons/schedulerd.ini | 0 .../etc/shinken/dependencies/sample.cfg | 0 .../etc/shinken/discovery/discovery.cfg | 0 .../etc/shinken/discovery/discovery_rules.cfg | 0 .../etc/shinken/discovery/discovery_runs.cfg | 0 .../etc/shinken/escalations/sample.cfg | 0 .../etc/shinken/hostgroups/linux.cfg | 0 .../etc/shinken/hosts/localhost.cfg | 0 .../etc/shinken/modules/auth_cfg_password.cfg | 0 .../etc/shinken/modules/influxdb.cfg | 0 .../etc/shinken/modules/mongodb.cfg | 0 .../etc/shinken/modules/webui.cfg | 0 .../etc/shinken/modules/ws_arbiter.cfg | 0 .../etc/shinken/notificationways/detailled-email.cfg | 0 .../etc/shinken/notificationways/email.cfg | 0 .../etc/shinken/notificationways/sms-android.cfg | 0 .../etc/shinken/packs/readme.cfg | 0 .../etc/shinken/pollers/poller-master.cfg | 0 .../shinken/reactionners/reactionner-android-sms.cfg | 0 .../etc/shinken/reactionners/reactionner-master.cfg | 0 .../{test_env => docker}/etc/shinken/realms/all.cfg | 0 .../etc/shinken/receivers/receiver-master.cfg | 0 .../etc/shinken/resource.d/active-directory.cfg | 0 .../etc/shinken/resource.d/nmap.cfg | 0 .../etc/shinken/resource.d/paths.cfg | 0 .../etc/shinken/resource.d/snmp.cfg | 0 .../etc/shinken/schedulers/scheduler-master.cfg | 0 .../etc/shinken/servicegroups/sample.cfg | 0 .../etc/shinken/services/services.cfg | 0 tools/{test_env => docker}/etc/shinken/shinken.cfg | 0 .../etc/shinken/templates/generic-contact.cfg | 0 .../etc/shinken/templates/generic-host.cfg | 0 .../etc/shinken/templates/generic-service.cfg | 0 .../etc/shinken/templates/srv-pnp.cfg | 0 .../etc/shinken/templates/time_templates.cfg | 0 .../etc/shinken/timeperiods/24x7.cfg | 0 .../etc/shinken/timeperiods/none.cfg | 0 .../etc/shinken/timeperiods/us-holidays.cfg | 0 .../etc/shinken/timeperiods/workhours.cfg | 0 .../etc/supervisor/conf.d/supervisor.conf | 0 .../var/www/html/grafana/config.js | 0 102 files changed, 7 insertions(+), 7 deletions(-) rename tools/test_env/Dockerfile => Dockerfile (83%) rename tools/{test_env => docker}/etc/apache2/conf-enabled/influxdb.conf (100%) rename tools/{test_env => docker}/etc/apache2/sites-available/grafana.conf (100%) rename tools/{test_env => docker}/etc/riemann/riemann.config (100%) rename tools/{test_env => docker}/etc/shinken/arbiters/arbiter-master.cfg (100%) rename tools/{test_env => docker}/etc/shinken/brokers/broker-master.cfg (100%) rename tools/{test_env => docker}/etc/shinken/certs/02.pem (100%) rename tools/{test_env => docker}/etc/shinken/certs/README (100%) rename tools/{test_env => docker}/etc/shinken/certs/ca.pem (100%) rename tools/{test_env => docker}/etc/shinken/certs/certindex.txt (100%) rename tools/{test_env => docker}/etc/shinken/certs/certindex.txt.attr (100%) rename tools/{test_env => docker}/etc/shinken/certs/certindex.txt.old (100%) rename tools/{test_env => docker}/etc/shinken/certs/client.pem (100%) rename tools/{test_env => docker}/etc/shinken/certs/demoCA/cacert.pem (100%) rename tools/{test_env => docker}/etc/shinken/certs/demoCA/careq.pem (100%) rename tools/{test_env => docker}/etc/shinken/certs/demoCA/crlnumber (100%) rename tools/{test_env => docker}/etc/shinken/certs/demoCA/index.txt (100%) rename tools/{test_env => docker}/etc/shinken/certs/demoCA/index.txt.attr (100%) rename tools/{test_env => docker}/etc/shinken/certs/demoCA/index.txt.attr.old (100%) rename tools/{test_env => docker}/etc/shinken/certs/demoCA/index.txt.old (100%) rename tools/{test_env => docker}/etc/shinken/certs/demoCA/newcerts/EC5B5DDAD51BE4A8.pem (100%) rename tools/{test_env => docker}/etc/shinken/certs/demoCA/newcerts/EC5B5DDAD51BE4A9.pem (100%) rename tools/{test_env => docker}/etc/shinken/certs/demoCA/private/cakey.pem (100%) rename tools/{test_env => docker}/etc/shinken/certs/demoCA/serial (100%) rename tools/{test_env => docker}/etc/shinken/certs/demoCA/serial.old (100%) rename tools/{test_env => docker}/etc/shinken/certs/serial (100%) rename tools/{test_env => docker}/etc/shinken/certs/serial.old (100%) rename tools/{test_env => docker}/etc/shinken/certs/server.cert (100%) rename tools/{test_env => docker}/etc/shinken/certs/server.key (100%) rename tools/{test_env => docker}/etc/shinken/certs/server.pem (100%) rename tools/{test_env => docker}/etc/shinken/certs/server.req (100%) rename tools/{test_env => docker}/etc/shinken/certs/shinken_openssl_cnf (100%) rename tools/{test_env => docker}/etc/shinken/commands/check_dig.cfg (100%) rename tools/{test_env => docker}/etc/shinken/commands/check_host_alive.cfg (100%) rename tools/{test_env => docker}/etc/shinken/commands/check_http_url.cfg (100%) rename tools/{test_env => docker}/etc/shinken/commands/check_nrpe.cfg (100%) rename tools/{test_env => docker}/etc/shinken/commands/check_nrpe_args.cfg (100%) rename tools/{test_env => docker}/etc/shinken/commands/check_ping.cfg (100%) rename tools/{test_env => docker}/etc/shinken/commands/check_snmp_service.cfg (100%) rename tools/{test_env => docker}/etc/shinken/commands/check_snmp_storage.cfg (100%) rename tools/{test_env => docker}/etc/shinken/commands/check_snmp_time.cfg (100%) rename tools/{test_env => docker}/etc/shinken/commands/check_tcp.cfg (100%) rename tools/{test_env => docker}/etc/shinken/commands/configuration-check.cfg (100%) rename tools/{test_env => docker}/etc/shinken/commands/detailled-host-by-email.cfg (100%) rename tools/{test_env => docker}/etc/shinken/commands/detailled-service-by-email.cfg (100%) rename tools/{test_env => docker}/etc/shinken/commands/notify-host-by-android-sms.cfg (100%) rename tools/{test_env => docker}/etc/shinken/commands/notify-host-by-email.cfg (100%) rename tools/{test_env => docker}/etc/shinken/commands/notify-host-by-xmpp.cfg (100%) rename tools/{test_env => docker}/etc/shinken/commands/notify-service-by-android-sms.cfg (100%) rename tools/{test_env => docker}/etc/shinken/commands/notify-service-by-email.cfg (100%) rename tools/{test_env => docker}/etc/shinken/commands/notify-service-by-xmpp.cfg (100%) rename tools/{test_env => docker}/etc/shinken/commands/reload-shinken.cfg (100%) rename tools/{test_env => docker}/etc/shinken/commands/restart-shinken.cfg (100%) rename tools/{test_env => docker}/etc/shinken/contactgroups/admins.cfg (100%) rename tools/{test_env => docker}/etc/shinken/contactgroups/users.cfg (100%) rename tools/{test_env => docker}/etc/shinken/contacts/admin.cfg (100%) rename tools/{test_env => docker}/etc/shinken/daemons/brokerd.ini (100%) rename tools/{test_env => docker}/etc/shinken/daemons/pollerd.ini (100%) rename tools/{test_env => docker}/etc/shinken/daemons/reactionnerd.ini (100%) rename tools/{test_env => docker}/etc/shinken/daemons/receiverd.ini (100%) rename tools/{test_env => docker}/etc/shinken/daemons/schedulerd.ini (100%) rename tools/{test_env => docker}/etc/shinken/dependencies/sample.cfg (100%) rename tools/{test_env => docker}/etc/shinken/discovery/discovery.cfg (100%) rename tools/{test_env => docker}/etc/shinken/discovery/discovery_rules.cfg (100%) rename tools/{test_env => docker}/etc/shinken/discovery/discovery_runs.cfg (100%) rename tools/{test_env => docker}/etc/shinken/escalations/sample.cfg (100%) rename tools/{test_env => docker}/etc/shinken/hostgroups/linux.cfg (100%) rename tools/{test_env => docker}/etc/shinken/hosts/localhost.cfg (100%) rename tools/{test_env => docker}/etc/shinken/modules/auth_cfg_password.cfg (100%) rename tools/{test_env => docker}/etc/shinken/modules/influxdb.cfg (100%) rename tools/{test_env => docker}/etc/shinken/modules/mongodb.cfg (100%) rename tools/{test_env => docker}/etc/shinken/modules/webui.cfg (100%) rename tools/{test_env => docker}/etc/shinken/modules/ws_arbiter.cfg (100%) rename tools/{test_env => docker}/etc/shinken/notificationways/detailled-email.cfg (100%) rename tools/{test_env => docker}/etc/shinken/notificationways/email.cfg (100%) rename tools/{test_env => docker}/etc/shinken/notificationways/sms-android.cfg (100%) rename tools/{test_env => docker}/etc/shinken/packs/readme.cfg (100%) rename tools/{test_env => docker}/etc/shinken/pollers/poller-master.cfg (100%) rename tools/{test_env => docker}/etc/shinken/reactionners/reactionner-android-sms.cfg (100%) rename tools/{test_env => docker}/etc/shinken/reactionners/reactionner-master.cfg (100%) rename tools/{test_env => docker}/etc/shinken/realms/all.cfg (100%) rename tools/{test_env => docker}/etc/shinken/receivers/receiver-master.cfg (100%) rename tools/{test_env => docker}/etc/shinken/resource.d/active-directory.cfg (100%) rename tools/{test_env => docker}/etc/shinken/resource.d/nmap.cfg (100%) rename tools/{test_env => docker}/etc/shinken/resource.d/paths.cfg (100%) rename tools/{test_env => docker}/etc/shinken/resource.d/snmp.cfg (100%) rename tools/{test_env => docker}/etc/shinken/schedulers/scheduler-master.cfg (100%) rename tools/{test_env => docker}/etc/shinken/servicegroups/sample.cfg (100%) rename tools/{test_env => docker}/etc/shinken/services/services.cfg (100%) rename tools/{test_env => docker}/etc/shinken/shinken.cfg (100%) rename tools/{test_env => docker}/etc/shinken/templates/generic-contact.cfg (100%) rename tools/{test_env => docker}/etc/shinken/templates/generic-host.cfg (100%) rename tools/{test_env => docker}/etc/shinken/templates/generic-service.cfg (100%) rename tools/{test_env => docker}/etc/shinken/templates/srv-pnp.cfg (100%) rename tools/{test_env => docker}/etc/shinken/templates/time_templates.cfg (100%) rename tools/{test_env => docker}/etc/shinken/timeperiods/24x7.cfg (100%) rename tools/{test_env => docker}/etc/shinken/timeperiods/none.cfg (100%) rename tools/{test_env => docker}/etc/shinken/timeperiods/us-holidays.cfg (100%) rename tools/{test_env => docker}/etc/shinken/timeperiods/workhours.cfg (100%) rename tools/{test_env => docker}/etc/supervisor/conf.d/supervisor.conf (100%) rename tools/{test_env => docker}/var/www/html/grafana/config.js (100%) diff --git a/tools/test_env/Dockerfile b/Dockerfile similarity index 83% rename from tools/test_env/Dockerfile rename to Dockerfile index b8d29e2..14848a7 100644 --- a/tools/test_env/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ RUN chmod u+s /bin/ping6 ## configuration RUN rm -rf /etc/shinken -ADD etc/shinken /etc/shinken +ADD tools/docker/etc/shinken /etc/shinken RUN chown -R root:shinken /etc/shinken ### Influxdb @@ -43,27 +43,27 @@ RUN service influxdb start && sleep 10 && curl -X POST 'http://localhost:8086/db RUN wget http://aphyr.com/riemann/riemann_0.2.6_all.deb RUN sudo dpkg -i riemann_0.2.6_all.deb RUN sudo apt-get install -y openjdk-7-jre -ADD etc/riemann/riemann.config /etc/riemann/riemann.config +ADD tools/docker/etc/riemann/riemann.config /etc/riemann/riemann.config ### Grafana RUN apt-get install -y apache2 RUN wget http://grafanarel.s3.amazonaws.com/grafana-1.7.0-rc1.tar.gz RUN tar xvf grafana-1.7.0-rc1.tar.gz RUN mv grafana-1.7.0-rc1 /var/www/html/grafana -ADD etc/apache2/sites-available/grafana.conf /etc/apache2/sites-available/grafana.conf -ADD var/www/html/grafana/config.js /var/www/html/grafana/config.js +ADD tools/docker/etc/apache2/sites-available/grafana.conf /etc/apache2/sites-available/grafana.conf +ADD tools/docker/var/www/html/grafana/config.js /var/www/html/grafana/config.js ## Influxdb reverse proxy for grafana RUN apt-get install -y libapache2-mod-proxy-html RUN a2enmod proxy_http -ADD etc/apache2/conf-enabled/influxdb.conf /etc/apache2/conf-enabled/influxdb.conf +ADD tools/docker/etc/apache2/conf-enabled/influxdb.conf /etc/apache2/conf-enabled/influxdb.conf ### Mongo RUN apt-get install -y mongodb ### Supervisor RUN apt-get -y install supervisor -ADD etc/supervisor /etc/supervisor +ADD tools/docker/etc/supervisor /etc/supervisor # Shinken WEBUI EXPOSE 7767 diff --git a/Makefile b/Makefile index 8104137..baca413 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ build: - sudo docker build -t surveil_image tools/test_env + sudo docker build -t surveil_image . kill: - sudo docker stop surveil diff --git a/tools/test_env/etc/apache2/conf-enabled/influxdb.conf b/tools/docker/etc/apache2/conf-enabled/influxdb.conf similarity index 100% rename from tools/test_env/etc/apache2/conf-enabled/influxdb.conf rename to tools/docker/etc/apache2/conf-enabled/influxdb.conf diff --git a/tools/test_env/etc/apache2/sites-available/grafana.conf b/tools/docker/etc/apache2/sites-available/grafana.conf similarity index 100% rename from tools/test_env/etc/apache2/sites-available/grafana.conf rename to tools/docker/etc/apache2/sites-available/grafana.conf diff --git a/tools/test_env/etc/riemann/riemann.config b/tools/docker/etc/riemann/riemann.config similarity index 100% rename from tools/test_env/etc/riemann/riemann.config rename to tools/docker/etc/riemann/riemann.config diff --git a/tools/test_env/etc/shinken/arbiters/arbiter-master.cfg b/tools/docker/etc/shinken/arbiters/arbiter-master.cfg similarity index 100% rename from tools/test_env/etc/shinken/arbiters/arbiter-master.cfg rename to tools/docker/etc/shinken/arbiters/arbiter-master.cfg diff --git a/tools/test_env/etc/shinken/brokers/broker-master.cfg b/tools/docker/etc/shinken/brokers/broker-master.cfg similarity index 100% rename from tools/test_env/etc/shinken/brokers/broker-master.cfg rename to tools/docker/etc/shinken/brokers/broker-master.cfg diff --git a/tools/test_env/etc/shinken/certs/02.pem b/tools/docker/etc/shinken/certs/02.pem similarity index 100% rename from tools/test_env/etc/shinken/certs/02.pem rename to tools/docker/etc/shinken/certs/02.pem diff --git a/tools/test_env/etc/shinken/certs/README b/tools/docker/etc/shinken/certs/README similarity index 100% rename from tools/test_env/etc/shinken/certs/README rename to tools/docker/etc/shinken/certs/README diff --git a/tools/test_env/etc/shinken/certs/ca.pem b/tools/docker/etc/shinken/certs/ca.pem similarity index 100% rename from tools/test_env/etc/shinken/certs/ca.pem rename to tools/docker/etc/shinken/certs/ca.pem diff --git a/tools/test_env/etc/shinken/certs/certindex.txt b/tools/docker/etc/shinken/certs/certindex.txt similarity index 100% rename from tools/test_env/etc/shinken/certs/certindex.txt rename to tools/docker/etc/shinken/certs/certindex.txt diff --git a/tools/test_env/etc/shinken/certs/certindex.txt.attr b/tools/docker/etc/shinken/certs/certindex.txt.attr similarity index 100% rename from tools/test_env/etc/shinken/certs/certindex.txt.attr rename to tools/docker/etc/shinken/certs/certindex.txt.attr diff --git a/tools/test_env/etc/shinken/certs/certindex.txt.old b/tools/docker/etc/shinken/certs/certindex.txt.old similarity index 100% rename from tools/test_env/etc/shinken/certs/certindex.txt.old rename to tools/docker/etc/shinken/certs/certindex.txt.old diff --git a/tools/test_env/etc/shinken/certs/client.pem b/tools/docker/etc/shinken/certs/client.pem similarity index 100% rename from tools/test_env/etc/shinken/certs/client.pem rename to tools/docker/etc/shinken/certs/client.pem diff --git a/tools/test_env/etc/shinken/certs/demoCA/cacert.pem b/tools/docker/etc/shinken/certs/demoCA/cacert.pem similarity index 100% rename from tools/test_env/etc/shinken/certs/demoCA/cacert.pem rename to tools/docker/etc/shinken/certs/demoCA/cacert.pem diff --git a/tools/test_env/etc/shinken/certs/demoCA/careq.pem b/tools/docker/etc/shinken/certs/demoCA/careq.pem similarity index 100% rename from tools/test_env/etc/shinken/certs/demoCA/careq.pem rename to tools/docker/etc/shinken/certs/demoCA/careq.pem diff --git a/tools/test_env/etc/shinken/certs/demoCA/crlnumber b/tools/docker/etc/shinken/certs/demoCA/crlnumber similarity index 100% rename from tools/test_env/etc/shinken/certs/demoCA/crlnumber rename to tools/docker/etc/shinken/certs/demoCA/crlnumber diff --git a/tools/test_env/etc/shinken/certs/demoCA/index.txt b/tools/docker/etc/shinken/certs/demoCA/index.txt similarity index 100% rename from tools/test_env/etc/shinken/certs/demoCA/index.txt rename to tools/docker/etc/shinken/certs/demoCA/index.txt diff --git a/tools/test_env/etc/shinken/certs/demoCA/index.txt.attr b/tools/docker/etc/shinken/certs/demoCA/index.txt.attr similarity index 100% rename from tools/test_env/etc/shinken/certs/demoCA/index.txt.attr rename to tools/docker/etc/shinken/certs/demoCA/index.txt.attr diff --git a/tools/test_env/etc/shinken/certs/demoCA/index.txt.attr.old b/tools/docker/etc/shinken/certs/demoCA/index.txt.attr.old similarity index 100% rename from tools/test_env/etc/shinken/certs/demoCA/index.txt.attr.old rename to tools/docker/etc/shinken/certs/demoCA/index.txt.attr.old diff --git a/tools/test_env/etc/shinken/certs/demoCA/index.txt.old b/tools/docker/etc/shinken/certs/demoCA/index.txt.old similarity index 100% rename from tools/test_env/etc/shinken/certs/demoCA/index.txt.old rename to tools/docker/etc/shinken/certs/demoCA/index.txt.old diff --git a/tools/test_env/etc/shinken/certs/demoCA/newcerts/EC5B5DDAD51BE4A8.pem b/tools/docker/etc/shinken/certs/demoCA/newcerts/EC5B5DDAD51BE4A8.pem similarity index 100% rename from tools/test_env/etc/shinken/certs/demoCA/newcerts/EC5B5DDAD51BE4A8.pem rename to tools/docker/etc/shinken/certs/demoCA/newcerts/EC5B5DDAD51BE4A8.pem diff --git a/tools/test_env/etc/shinken/certs/demoCA/newcerts/EC5B5DDAD51BE4A9.pem b/tools/docker/etc/shinken/certs/demoCA/newcerts/EC5B5DDAD51BE4A9.pem similarity index 100% rename from tools/test_env/etc/shinken/certs/demoCA/newcerts/EC5B5DDAD51BE4A9.pem rename to tools/docker/etc/shinken/certs/demoCA/newcerts/EC5B5DDAD51BE4A9.pem diff --git a/tools/test_env/etc/shinken/certs/demoCA/private/cakey.pem b/tools/docker/etc/shinken/certs/demoCA/private/cakey.pem similarity index 100% rename from tools/test_env/etc/shinken/certs/demoCA/private/cakey.pem rename to tools/docker/etc/shinken/certs/demoCA/private/cakey.pem diff --git a/tools/test_env/etc/shinken/certs/demoCA/serial b/tools/docker/etc/shinken/certs/demoCA/serial similarity index 100% rename from tools/test_env/etc/shinken/certs/demoCA/serial rename to tools/docker/etc/shinken/certs/demoCA/serial diff --git a/tools/test_env/etc/shinken/certs/demoCA/serial.old b/tools/docker/etc/shinken/certs/demoCA/serial.old similarity index 100% rename from tools/test_env/etc/shinken/certs/demoCA/serial.old rename to tools/docker/etc/shinken/certs/demoCA/serial.old diff --git a/tools/test_env/etc/shinken/certs/serial b/tools/docker/etc/shinken/certs/serial similarity index 100% rename from tools/test_env/etc/shinken/certs/serial rename to tools/docker/etc/shinken/certs/serial diff --git a/tools/test_env/etc/shinken/certs/serial.old b/tools/docker/etc/shinken/certs/serial.old similarity index 100% rename from tools/test_env/etc/shinken/certs/serial.old rename to tools/docker/etc/shinken/certs/serial.old diff --git a/tools/test_env/etc/shinken/certs/server.cert b/tools/docker/etc/shinken/certs/server.cert similarity index 100% rename from tools/test_env/etc/shinken/certs/server.cert rename to tools/docker/etc/shinken/certs/server.cert diff --git a/tools/test_env/etc/shinken/certs/server.key b/tools/docker/etc/shinken/certs/server.key similarity index 100% rename from tools/test_env/etc/shinken/certs/server.key rename to tools/docker/etc/shinken/certs/server.key diff --git a/tools/test_env/etc/shinken/certs/server.pem b/tools/docker/etc/shinken/certs/server.pem similarity index 100% rename from tools/test_env/etc/shinken/certs/server.pem rename to tools/docker/etc/shinken/certs/server.pem diff --git a/tools/test_env/etc/shinken/certs/server.req b/tools/docker/etc/shinken/certs/server.req similarity index 100% rename from tools/test_env/etc/shinken/certs/server.req rename to tools/docker/etc/shinken/certs/server.req diff --git a/tools/test_env/etc/shinken/certs/shinken_openssl_cnf b/tools/docker/etc/shinken/certs/shinken_openssl_cnf similarity index 100% rename from tools/test_env/etc/shinken/certs/shinken_openssl_cnf rename to tools/docker/etc/shinken/certs/shinken_openssl_cnf diff --git a/tools/test_env/etc/shinken/commands/check_dig.cfg b/tools/docker/etc/shinken/commands/check_dig.cfg similarity index 100% rename from tools/test_env/etc/shinken/commands/check_dig.cfg rename to tools/docker/etc/shinken/commands/check_dig.cfg diff --git a/tools/test_env/etc/shinken/commands/check_host_alive.cfg b/tools/docker/etc/shinken/commands/check_host_alive.cfg similarity index 100% rename from tools/test_env/etc/shinken/commands/check_host_alive.cfg rename to tools/docker/etc/shinken/commands/check_host_alive.cfg diff --git a/tools/test_env/etc/shinken/commands/check_http_url.cfg b/tools/docker/etc/shinken/commands/check_http_url.cfg similarity index 100% rename from tools/test_env/etc/shinken/commands/check_http_url.cfg rename to tools/docker/etc/shinken/commands/check_http_url.cfg diff --git a/tools/test_env/etc/shinken/commands/check_nrpe.cfg b/tools/docker/etc/shinken/commands/check_nrpe.cfg similarity index 100% rename from tools/test_env/etc/shinken/commands/check_nrpe.cfg rename to tools/docker/etc/shinken/commands/check_nrpe.cfg diff --git a/tools/test_env/etc/shinken/commands/check_nrpe_args.cfg b/tools/docker/etc/shinken/commands/check_nrpe_args.cfg similarity index 100% rename from tools/test_env/etc/shinken/commands/check_nrpe_args.cfg rename to tools/docker/etc/shinken/commands/check_nrpe_args.cfg diff --git a/tools/test_env/etc/shinken/commands/check_ping.cfg b/tools/docker/etc/shinken/commands/check_ping.cfg similarity index 100% rename from tools/test_env/etc/shinken/commands/check_ping.cfg rename to tools/docker/etc/shinken/commands/check_ping.cfg diff --git a/tools/test_env/etc/shinken/commands/check_snmp_service.cfg b/tools/docker/etc/shinken/commands/check_snmp_service.cfg similarity index 100% rename from tools/test_env/etc/shinken/commands/check_snmp_service.cfg rename to tools/docker/etc/shinken/commands/check_snmp_service.cfg diff --git a/tools/test_env/etc/shinken/commands/check_snmp_storage.cfg b/tools/docker/etc/shinken/commands/check_snmp_storage.cfg similarity index 100% rename from tools/test_env/etc/shinken/commands/check_snmp_storage.cfg rename to tools/docker/etc/shinken/commands/check_snmp_storage.cfg diff --git a/tools/test_env/etc/shinken/commands/check_snmp_time.cfg b/tools/docker/etc/shinken/commands/check_snmp_time.cfg similarity index 100% rename from tools/test_env/etc/shinken/commands/check_snmp_time.cfg rename to tools/docker/etc/shinken/commands/check_snmp_time.cfg diff --git a/tools/test_env/etc/shinken/commands/check_tcp.cfg b/tools/docker/etc/shinken/commands/check_tcp.cfg similarity index 100% rename from tools/test_env/etc/shinken/commands/check_tcp.cfg rename to tools/docker/etc/shinken/commands/check_tcp.cfg diff --git a/tools/test_env/etc/shinken/commands/configuration-check.cfg b/tools/docker/etc/shinken/commands/configuration-check.cfg similarity index 100% rename from tools/test_env/etc/shinken/commands/configuration-check.cfg rename to tools/docker/etc/shinken/commands/configuration-check.cfg diff --git a/tools/test_env/etc/shinken/commands/detailled-host-by-email.cfg b/tools/docker/etc/shinken/commands/detailled-host-by-email.cfg similarity index 100% rename from tools/test_env/etc/shinken/commands/detailled-host-by-email.cfg rename to tools/docker/etc/shinken/commands/detailled-host-by-email.cfg diff --git a/tools/test_env/etc/shinken/commands/detailled-service-by-email.cfg b/tools/docker/etc/shinken/commands/detailled-service-by-email.cfg similarity index 100% rename from tools/test_env/etc/shinken/commands/detailled-service-by-email.cfg rename to tools/docker/etc/shinken/commands/detailled-service-by-email.cfg diff --git a/tools/test_env/etc/shinken/commands/notify-host-by-android-sms.cfg b/tools/docker/etc/shinken/commands/notify-host-by-android-sms.cfg similarity index 100% rename from tools/test_env/etc/shinken/commands/notify-host-by-android-sms.cfg rename to tools/docker/etc/shinken/commands/notify-host-by-android-sms.cfg diff --git a/tools/test_env/etc/shinken/commands/notify-host-by-email.cfg b/tools/docker/etc/shinken/commands/notify-host-by-email.cfg similarity index 100% rename from tools/test_env/etc/shinken/commands/notify-host-by-email.cfg rename to tools/docker/etc/shinken/commands/notify-host-by-email.cfg diff --git a/tools/test_env/etc/shinken/commands/notify-host-by-xmpp.cfg b/tools/docker/etc/shinken/commands/notify-host-by-xmpp.cfg similarity index 100% rename from tools/test_env/etc/shinken/commands/notify-host-by-xmpp.cfg rename to tools/docker/etc/shinken/commands/notify-host-by-xmpp.cfg diff --git a/tools/test_env/etc/shinken/commands/notify-service-by-android-sms.cfg b/tools/docker/etc/shinken/commands/notify-service-by-android-sms.cfg similarity index 100% rename from tools/test_env/etc/shinken/commands/notify-service-by-android-sms.cfg rename to tools/docker/etc/shinken/commands/notify-service-by-android-sms.cfg diff --git a/tools/test_env/etc/shinken/commands/notify-service-by-email.cfg b/tools/docker/etc/shinken/commands/notify-service-by-email.cfg similarity index 100% rename from tools/test_env/etc/shinken/commands/notify-service-by-email.cfg rename to tools/docker/etc/shinken/commands/notify-service-by-email.cfg diff --git a/tools/test_env/etc/shinken/commands/notify-service-by-xmpp.cfg b/tools/docker/etc/shinken/commands/notify-service-by-xmpp.cfg similarity index 100% rename from tools/test_env/etc/shinken/commands/notify-service-by-xmpp.cfg rename to tools/docker/etc/shinken/commands/notify-service-by-xmpp.cfg diff --git a/tools/test_env/etc/shinken/commands/reload-shinken.cfg b/tools/docker/etc/shinken/commands/reload-shinken.cfg similarity index 100% rename from tools/test_env/etc/shinken/commands/reload-shinken.cfg rename to tools/docker/etc/shinken/commands/reload-shinken.cfg diff --git a/tools/test_env/etc/shinken/commands/restart-shinken.cfg b/tools/docker/etc/shinken/commands/restart-shinken.cfg similarity index 100% rename from tools/test_env/etc/shinken/commands/restart-shinken.cfg rename to tools/docker/etc/shinken/commands/restart-shinken.cfg diff --git a/tools/test_env/etc/shinken/contactgroups/admins.cfg b/tools/docker/etc/shinken/contactgroups/admins.cfg similarity index 100% rename from tools/test_env/etc/shinken/contactgroups/admins.cfg rename to tools/docker/etc/shinken/contactgroups/admins.cfg diff --git a/tools/test_env/etc/shinken/contactgroups/users.cfg b/tools/docker/etc/shinken/contactgroups/users.cfg similarity index 100% rename from tools/test_env/etc/shinken/contactgroups/users.cfg rename to tools/docker/etc/shinken/contactgroups/users.cfg diff --git a/tools/test_env/etc/shinken/contacts/admin.cfg b/tools/docker/etc/shinken/contacts/admin.cfg similarity index 100% rename from tools/test_env/etc/shinken/contacts/admin.cfg rename to tools/docker/etc/shinken/contacts/admin.cfg diff --git a/tools/test_env/etc/shinken/daemons/brokerd.ini b/tools/docker/etc/shinken/daemons/brokerd.ini similarity index 100% rename from tools/test_env/etc/shinken/daemons/brokerd.ini rename to tools/docker/etc/shinken/daemons/brokerd.ini diff --git a/tools/test_env/etc/shinken/daemons/pollerd.ini b/tools/docker/etc/shinken/daemons/pollerd.ini similarity index 100% rename from tools/test_env/etc/shinken/daemons/pollerd.ini rename to tools/docker/etc/shinken/daemons/pollerd.ini diff --git a/tools/test_env/etc/shinken/daemons/reactionnerd.ini b/tools/docker/etc/shinken/daemons/reactionnerd.ini similarity index 100% rename from tools/test_env/etc/shinken/daemons/reactionnerd.ini rename to tools/docker/etc/shinken/daemons/reactionnerd.ini diff --git a/tools/test_env/etc/shinken/daemons/receiverd.ini b/tools/docker/etc/shinken/daemons/receiverd.ini similarity index 100% rename from tools/test_env/etc/shinken/daemons/receiverd.ini rename to tools/docker/etc/shinken/daemons/receiverd.ini diff --git a/tools/test_env/etc/shinken/daemons/schedulerd.ini b/tools/docker/etc/shinken/daemons/schedulerd.ini similarity index 100% rename from tools/test_env/etc/shinken/daemons/schedulerd.ini rename to tools/docker/etc/shinken/daemons/schedulerd.ini diff --git a/tools/test_env/etc/shinken/dependencies/sample.cfg b/tools/docker/etc/shinken/dependencies/sample.cfg similarity index 100% rename from tools/test_env/etc/shinken/dependencies/sample.cfg rename to tools/docker/etc/shinken/dependencies/sample.cfg diff --git a/tools/test_env/etc/shinken/discovery/discovery.cfg b/tools/docker/etc/shinken/discovery/discovery.cfg similarity index 100% rename from tools/test_env/etc/shinken/discovery/discovery.cfg rename to tools/docker/etc/shinken/discovery/discovery.cfg diff --git a/tools/test_env/etc/shinken/discovery/discovery_rules.cfg b/tools/docker/etc/shinken/discovery/discovery_rules.cfg similarity index 100% rename from tools/test_env/etc/shinken/discovery/discovery_rules.cfg rename to tools/docker/etc/shinken/discovery/discovery_rules.cfg diff --git a/tools/test_env/etc/shinken/discovery/discovery_runs.cfg b/tools/docker/etc/shinken/discovery/discovery_runs.cfg similarity index 100% rename from tools/test_env/etc/shinken/discovery/discovery_runs.cfg rename to tools/docker/etc/shinken/discovery/discovery_runs.cfg diff --git a/tools/test_env/etc/shinken/escalations/sample.cfg b/tools/docker/etc/shinken/escalations/sample.cfg similarity index 100% rename from tools/test_env/etc/shinken/escalations/sample.cfg rename to tools/docker/etc/shinken/escalations/sample.cfg diff --git a/tools/test_env/etc/shinken/hostgroups/linux.cfg b/tools/docker/etc/shinken/hostgroups/linux.cfg similarity index 100% rename from tools/test_env/etc/shinken/hostgroups/linux.cfg rename to tools/docker/etc/shinken/hostgroups/linux.cfg diff --git a/tools/test_env/etc/shinken/hosts/localhost.cfg b/tools/docker/etc/shinken/hosts/localhost.cfg similarity index 100% rename from tools/test_env/etc/shinken/hosts/localhost.cfg rename to tools/docker/etc/shinken/hosts/localhost.cfg diff --git a/tools/test_env/etc/shinken/modules/auth_cfg_password.cfg b/tools/docker/etc/shinken/modules/auth_cfg_password.cfg similarity index 100% rename from tools/test_env/etc/shinken/modules/auth_cfg_password.cfg rename to tools/docker/etc/shinken/modules/auth_cfg_password.cfg diff --git a/tools/test_env/etc/shinken/modules/influxdb.cfg b/tools/docker/etc/shinken/modules/influxdb.cfg similarity index 100% rename from tools/test_env/etc/shinken/modules/influxdb.cfg rename to tools/docker/etc/shinken/modules/influxdb.cfg diff --git a/tools/test_env/etc/shinken/modules/mongodb.cfg b/tools/docker/etc/shinken/modules/mongodb.cfg similarity index 100% rename from tools/test_env/etc/shinken/modules/mongodb.cfg rename to tools/docker/etc/shinken/modules/mongodb.cfg diff --git a/tools/test_env/etc/shinken/modules/webui.cfg b/tools/docker/etc/shinken/modules/webui.cfg similarity index 100% rename from tools/test_env/etc/shinken/modules/webui.cfg rename to tools/docker/etc/shinken/modules/webui.cfg diff --git a/tools/test_env/etc/shinken/modules/ws_arbiter.cfg b/tools/docker/etc/shinken/modules/ws_arbiter.cfg similarity index 100% rename from tools/test_env/etc/shinken/modules/ws_arbiter.cfg rename to tools/docker/etc/shinken/modules/ws_arbiter.cfg diff --git a/tools/test_env/etc/shinken/notificationways/detailled-email.cfg b/tools/docker/etc/shinken/notificationways/detailled-email.cfg similarity index 100% rename from tools/test_env/etc/shinken/notificationways/detailled-email.cfg rename to tools/docker/etc/shinken/notificationways/detailled-email.cfg diff --git a/tools/test_env/etc/shinken/notificationways/email.cfg b/tools/docker/etc/shinken/notificationways/email.cfg similarity index 100% rename from tools/test_env/etc/shinken/notificationways/email.cfg rename to tools/docker/etc/shinken/notificationways/email.cfg diff --git a/tools/test_env/etc/shinken/notificationways/sms-android.cfg b/tools/docker/etc/shinken/notificationways/sms-android.cfg similarity index 100% rename from tools/test_env/etc/shinken/notificationways/sms-android.cfg rename to tools/docker/etc/shinken/notificationways/sms-android.cfg diff --git a/tools/test_env/etc/shinken/packs/readme.cfg b/tools/docker/etc/shinken/packs/readme.cfg similarity index 100% rename from tools/test_env/etc/shinken/packs/readme.cfg rename to tools/docker/etc/shinken/packs/readme.cfg diff --git a/tools/test_env/etc/shinken/pollers/poller-master.cfg b/tools/docker/etc/shinken/pollers/poller-master.cfg similarity index 100% rename from tools/test_env/etc/shinken/pollers/poller-master.cfg rename to tools/docker/etc/shinken/pollers/poller-master.cfg diff --git a/tools/test_env/etc/shinken/reactionners/reactionner-android-sms.cfg b/tools/docker/etc/shinken/reactionners/reactionner-android-sms.cfg similarity index 100% rename from tools/test_env/etc/shinken/reactionners/reactionner-android-sms.cfg rename to tools/docker/etc/shinken/reactionners/reactionner-android-sms.cfg diff --git a/tools/test_env/etc/shinken/reactionners/reactionner-master.cfg b/tools/docker/etc/shinken/reactionners/reactionner-master.cfg similarity index 100% rename from tools/test_env/etc/shinken/reactionners/reactionner-master.cfg rename to tools/docker/etc/shinken/reactionners/reactionner-master.cfg diff --git a/tools/test_env/etc/shinken/realms/all.cfg b/tools/docker/etc/shinken/realms/all.cfg similarity index 100% rename from tools/test_env/etc/shinken/realms/all.cfg rename to tools/docker/etc/shinken/realms/all.cfg diff --git a/tools/test_env/etc/shinken/receivers/receiver-master.cfg b/tools/docker/etc/shinken/receivers/receiver-master.cfg similarity index 100% rename from tools/test_env/etc/shinken/receivers/receiver-master.cfg rename to tools/docker/etc/shinken/receivers/receiver-master.cfg diff --git a/tools/test_env/etc/shinken/resource.d/active-directory.cfg b/tools/docker/etc/shinken/resource.d/active-directory.cfg similarity index 100% rename from tools/test_env/etc/shinken/resource.d/active-directory.cfg rename to tools/docker/etc/shinken/resource.d/active-directory.cfg diff --git a/tools/test_env/etc/shinken/resource.d/nmap.cfg b/tools/docker/etc/shinken/resource.d/nmap.cfg similarity index 100% rename from tools/test_env/etc/shinken/resource.d/nmap.cfg rename to tools/docker/etc/shinken/resource.d/nmap.cfg diff --git a/tools/test_env/etc/shinken/resource.d/paths.cfg b/tools/docker/etc/shinken/resource.d/paths.cfg similarity index 100% rename from tools/test_env/etc/shinken/resource.d/paths.cfg rename to tools/docker/etc/shinken/resource.d/paths.cfg diff --git a/tools/test_env/etc/shinken/resource.d/snmp.cfg b/tools/docker/etc/shinken/resource.d/snmp.cfg similarity index 100% rename from tools/test_env/etc/shinken/resource.d/snmp.cfg rename to tools/docker/etc/shinken/resource.d/snmp.cfg diff --git a/tools/test_env/etc/shinken/schedulers/scheduler-master.cfg b/tools/docker/etc/shinken/schedulers/scheduler-master.cfg similarity index 100% rename from tools/test_env/etc/shinken/schedulers/scheduler-master.cfg rename to tools/docker/etc/shinken/schedulers/scheduler-master.cfg diff --git a/tools/test_env/etc/shinken/servicegroups/sample.cfg b/tools/docker/etc/shinken/servicegroups/sample.cfg similarity index 100% rename from tools/test_env/etc/shinken/servicegroups/sample.cfg rename to tools/docker/etc/shinken/servicegroups/sample.cfg diff --git a/tools/test_env/etc/shinken/services/services.cfg b/tools/docker/etc/shinken/services/services.cfg similarity index 100% rename from tools/test_env/etc/shinken/services/services.cfg rename to tools/docker/etc/shinken/services/services.cfg diff --git a/tools/test_env/etc/shinken/shinken.cfg b/tools/docker/etc/shinken/shinken.cfg similarity index 100% rename from tools/test_env/etc/shinken/shinken.cfg rename to tools/docker/etc/shinken/shinken.cfg diff --git a/tools/test_env/etc/shinken/templates/generic-contact.cfg b/tools/docker/etc/shinken/templates/generic-contact.cfg similarity index 100% rename from tools/test_env/etc/shinken/templates/generic-contact.cfg rename to tools/docker/etc/shinken/templates/generic-contact.cfg diff --git a/tools/test_env/etc/shinken/templates/generic-host.cfg b/tools/docker/etc/shinken/templates/generic-host.cfg similarity index 100% rename from tools/test_env/etc/shinken/templates/generic-host.cfg rename to tools/docker/etc/shinken/templates/generic-host.cfg diff --git a/tools/test_env/etc/shinken/templates/generic-service.cfg b/tools/docker/etc/shinken/templates/generic-service.cfg similarity index 100% rename from tools/test_env/etc/shinken/templates/generic-service.cfg rename to tools/docker/etc/shinken/templates/generic-service.cfg diff --git a/tools/test_env/etc/shinken/templates/srv-pnp.cfg b/tools/docker/etc/shinken/templates/srv-pnp.cfg similarity index 100% rename from tools/test_env/etc/shinken/templates/srv-pnp.cfg rename to tools/docker/etc/shinken/templates/srv-pnp.cfg diff --git a/tools/test_env/etc/shinken/templates/time_templates.cfg b/tools/docker/etc/shinken/templates/time_templates.cfg similarity index 100% rename from tools/test_env/etc/shinken/templates/time_templates.cfg rename to tools/docker/etc/shinken/templates/time_templates.cfg diff --git a/tools/test_env/etc/shinken/timeperiods/24x7.cfg b/tools/docker/etc/shinken/timeperiods/24x7.cfg similarity index 100% rename from tools/test_env/etc/shinken/timeperiods/24x7.cfg rename to tools/docker/etc/shinken/timeperiods/24x7.cfg diff --git a/tools/test_env/etc/shinken/timeperiods/none.cfg b/tools/docker/etc/shinken/timeperiods/none.cfg similarity index 100% rename from tools/test_env/etc/shinken/timeperiods/none.cfg rename to tools/docker/etc/shinken/timeperiods/none.cfg diff --git a/tools/test_env/etc/shinken/timeperiods/us-holidays.cfg b/tools/docker/etc/shinken/timeperiods/us-holidays.cfg similarity index 100% rename from tools/test_env/etc/shinken/timeperiods/us-holidays.cfg rename to tools/docker/etc/shinken/timeperiods/us-holidays.cfg diff --git a/tools/test_env/etc/shinken/timeperiods/workhours.cfg b/tools/docker/etc/shinken/timeperiods/workhours.cfg similarity index 100% rename from tools/test_env/etc/shinken/timeperiods/workhours.cfg rename to tools/docker/etc/shinken/timeperiods/workhours.cfg diff --git a/tools/test_env/etc/supervisor/conf.d/supervisor.conf b/tools/docker/etc/supervisor/conf.d/supervisor.conf similarity index 100% rename from tools/test_env/etc/supervisor/conf.d/supervisor.conf rename to tools/docker/etc/supervisor/conf.d/supervisor.conf diff --git a/tools/test_env/var/www/html/grafana/config.js b/tools/docker/var/www/html/grafana/config.js similarity index 100% rename from tools/test_env/var/www/html/grafana/config.js rename to tools/docker/var/www/html/grafana/config.js