diff --git a/Dockerfile b/Dockerfile index 0561dff..f97f86d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,8 @@ MAINTAINER Alexandre Viau RUN apt-get update && apt-get install -y vim python-pip python3-pip python-dev libffi-dev libssl-dev git python-pycurl -# Surveil needs shinken (as a lib) -RUN useradd shinken && pip install https://github.com/naparuba/shinken/archive/2.2-RC1.zip +# Surveil needs alignak (as a lib) +RUN useradd shinken && pip install https://github.com/Alignak-monitoring/alignak/archive/396d10105827f8c75686811991829548e6778e11.zip # python-surveilclient (used by surveil-init) RUN pip install python-surveilclient==0.5.1 diff --git a/docker-compose-production.yml b/docker-compose-production.yml index bf9d146..095214a 100644 --- a/docker-compose-production.yml +++ b/docker-compose-production.yml @@ -1,10 +1,10 @@ surveil: #build: . - image: savoirfairelinux/surveil:0.4.2 + image: savoirfairelinux/surveil:0.4.3 links: - mongo - influxdb - - shinken + - alignak ports: - "8080:8080" environment: @@ -16,9 +16,9 @@ surveil: #SURVEIL_KEYSTONE_ADMIN_PASSWORD: "password" #SURVEIL_KEYSTONE_ADMIN_TENANT_NAME: "admin" -shinken: - #build: tools/docker/shinken_container/ - image: savoirfairelinux/surveil-shinken:0.4.2 +alignak: + #build: tools/docker/alignak_container/ + image: savoirfairelinux/surveil-alignak:0.4.3 links: - mongo - influxdb diff --git a/docker-compose.yml b/docker-compose.yml index c08b5b7..cc7022d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ surveil: links: - mongo - influxdb - - shinken + - alignak ports: - "8080:8080" environment: @@ -13,8 +13,8 @@ surveil: command: bash -c "cd /opt/surveil && ./setup.sh && python setup.py develop && ((sleep 40 && surveil-init --demo) &) && sleep 20 && surveil-api --reload" # privileged: true # Fedora users might want to uncomment this if they face permission issues -shinken: - build: tools/docker/shinken_container/ +alignak: + build: tools/docker/alignak_container/ links: - mongo - influxdb diff --git a/surveil/api/config.py b/surveil/api/config.py index 91de77c..c6d1c6e 100644 --- a/surveil/api/config.py +++ b/surveil/api/config.py @@ -26,7 +26,7 @@ server = { # as long as is it in the same format. surveil_api_config = { "mongodb_uri": "mongodb://mongo:27017", - "ws_arbiter_url": "http://shinken:7760", + "ws_arbiter_url": "http://alignak:7760", "influxdb_uri": "influxdb://root:root@influxdb:8086/db" } diff --git a/tools/docker/shinken_container/Dockerfile b/tools/docker/alignak_container/Dockerfile similarity index 99% rename from tools/docker/shinken_container/Dockerfile rename to tools/docker/alignak_container/Dockerfile index ca5c1c9..e489ad5 100644 --- a/tools/docker/shinken_container/Dockerfile +++ b/tools/docker/alignak_container/Dockerfile @@ -5,7 +5,7 @@ MAINTAINER Alexandre Viau RUN apt-get update && apt-get install -y vim supervisor python-dev libffi-dev libssl-dev nagios-nrpe-server wget # libffi-devand libssl-dev are for python-cryptography -### Shinken +### Alignak RUN apt-get update && apt-get install -y python-pip git RUN useradd shinken && pip install https://github.com/gst/shinken/archive/19df05f2da13bdc6957ef1adf0660aa9f61c89f7.zip RUN apt-get install -y python-pycurl diff --git a/tools/docker/shinken_container/etc/shinken/arbiters/arbiter-master.cfg b/tools/docker/alignak_container/etc/shinken/arbiters/arbiter-master.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/arbiters/arbiter-master.cfg rename to tools/docker/alignak_container/etc/shinken/arbiters/arbiter-master.cfg diff --git a/tools/docker/shinken_container/etc/shinken/brokers/broker-master.cfg b/tools/docker/alignak_container/etc/shinken/brokers/broker-master.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/brokers/broker-master.cfg rename to tools/docker/alignak_container/etc/shinken/brokers/broker-master.cfg diff --git a/tools/docker/shinken_container/etc/shinken/certs/02.pem b/tools/docker/alignak_container/etc/shinken/certs/02.pem similarity index 100% rename from tools/docker/shinken_container/etc/shinken/certs/02.pem rename to tools/docker/alignak_container/etc/shinken/certs/02.pem diff --git a/tools/docker/shinken_container/etc/shinken/certs/README b/tools/docker/alignak_container/etc/shinken/certs/README similarity index 100% rename from tools/docker/shinken_container/etc/shinken/certs/README rename to tools/docker/alignak_container/etc/shinken/certs/README diff --git a/tools/docker/shinken_container/etc/shinken/certs/ca.pem b/tools/docker/alignak_container/etc/shinken/certs/ca.pem similarity index 100% rename from tools/docker/shinken_container/etc/shinken/certs/ca.pem rename to tools/docker/alignak_container/etc/shinken/certs/ca.pem diff --git a/tools/docker/shinken_container/etc/shinken/certs/certindex.txt b/tools/docker/alignak_container/etc/shinken/certs/certindex.txt similarity index 100% rename from tools/docker/shinken_container/etc/shinken/certs/certindex.txt rename to tools/docker/alignak_container/etc/shinken/certs/certindex.txt diff --git a/tools/docker/shinken_container/etc/shinken/certs/certindex.txt.attr b/tools/docker/alignak_container/etc/shinken/certs/certindex.txt.attr similarity index 100% rename from tools/docker/shinken_container/etc/shinken/certs/certindex.txt.attr rename to tools/docker/alignak_container/etc/shinken/certs/certindex.txt.attr diff --git a/tools/docker/shinken_container/etc/shinken/certs/certindex.txt.old b/tools/docker/alignak_container/etc/shinken/certs/certindex.txt.old similarity index 100% rename from tools/docker/shinken_container/etc/shinken/certs/certindex.txt.old rename to tools/docker/alignak_container/etc/shinken/certs/certindex.txt.old diff --git a/tools/docker/shinken_container/etc/shinken/certs/client.pem b/tools/docker/alignak_container/etc/shinken/certs/client.pem similarity index 100% rename from tools/docker/shinken_container/etc/shinken/certs/client.pem rename to tools/docker/alignak_container/etc/shinken/certs/client.pem diff --git a/tools/docker/shinken_container/etc/shinken/certs/demoCA/cacert.pem b/tools/docker/alignak_container/etc/shinken/certs/demoCA/cacert.pem similarity index 100% rename from tools/docker/shinken_container/etc/shinken/certs/demoCA/cacert.pem rename to tools/docker/alignak_container/etc/shinken/certs/demoCA/cacert.pem diff --git a/tools/docker/shinken_container/etc/shinken/certs/demoCA/careq.pem b/tools/docker/alignak_container/etc/shinken/certs/demoCA/careq.pem similarity index 100% rename from tools/docker/shinken_container/etc/shinken/certs/demoCA/careq.pem rename to tools/docker/alignak_container/etc/shinken/certs/demoCA/careq.pem diff --git a/tools/docker/shinken_container/etc/shinken/certs/demoCA/crlnumber b/tools/docker/alignak_container/etc/shinken/certs/demoCA/crlnumber similarity index 100% rename from tools/docker/shinken_container/etc/shinken/certs/demoCA/crlnumber rename to tools/docker/alignak_container/etc/shinken/certs/demoCA/crlnumber diff --git a/tools/docker/shinken_container/etc/shinken/certs/demoCA/index.txt b/tools/docker/alignak_container/etc/shinken/certs/demoCA/index.txt similarity index 100% rename from tools/docker/shinken_container/etc/shinken/certs/demoCA/index.txt rename to tools/docker/alignak_container/etc/shinken/certs/demoCA/index.txt diff --git a/tools/docker/shinken_container/etc/shinken/certs/demoCA/index.txt.attr b/tools/docker/alignak_container/etc/shinken/certs/demoCA/index.txt.attr similarity index 100% rename from tools/docker/shinken_container/etc/shinken/certs/demoCA/index.txt.attr rename to tools/docker/alignak_container/etc/shinken/certs/demoCA/index.txt.attr diff --git a/tools/docker/shinken_container/etc/shinken/certs/demoCA/index.txt.attr.old b/tools/docker/alignak_container/etc/shinken/certs/demoCA/index.txt.attr.old similarity index 100% rename from tools/docker/shinken_container/etc/shinken/certs/demoCA/index.txt.attr.old rename to tools/docker/alignak_container/etc/shinken/certs/demoCA/index.txt.attr.old diff --git a/tools/docker/shinken_container/etc/shinken/certs/demoCA/index.txt.old b/tools/docker/alignak_container/etc/shinken/certs/demoCA/index.txt.old similarity index 100% rename from tools/docker/shinken_container/etc/shinken/certs/demoCA/index.txt.old rename to tools/docker/alignak_container/etc/shinken/certs/demoCA/index.txt.old diff --git a/tools/docker/shinken_container/etc/shinken/certs/demoCA/newcerts/EC5B5DDAD51BE4A8.pem b/tools/docker/alignak_container/etc/shinken/certs/demoCA/newcerts/EC5B5DDAD51BE4A8.pem similarity index 100% rename from tools/docker/shinken_container/etc/shinken/certs/demoCA/newcerts/EC5B5DDAD51BE4A8.pem rename to tools/docker/alignak_container/etc/shinken/certs/demoCA/newcerts/EC5B5DDAD51BE4A8.pem diff --git a/tools/docker/shinken_container/etc/shinken/certs/demoCA/newcerts/EC5B5DDAD51BE4A9.pem b/tools/docker/alignak_container/etc/shinken/certs/demoCA/newcerts/EC5B5DDAD51BE4A9.pem similarity index 100% rename from tools/docker/shinken_container/etc/shinken/certs/demoCA/newcerts/EC5B5DDAD51BE4A9.pem rename to tools/docker/alignak_container/etc/shinken/certs/demoCA/newcerts/EC5B5DDAD51BE4A9.pem diff --git a/tools/docker/shinken_container/etc/shinken/certs/demoCA/private/cakey.pem b/tools/docker/alignak_container/etc/shinken/certs/demoCA/private/cakey.pem similarity index 100% rename from tools/docker/shinken_container/etc/shinken/certs/demoCA/private/cakey.pem rename to tools/docker/alignak_container/etc/shinken/certs/demoCA/private/cakey.pem diff --git a/tools/docker/shinken_container/etc/shinken/certs/demoCA/serial b/tools/docker/alignak_container/etc/shinken/certs/demoCA/serial similarity index 100% rename from tools/docker/shinken_container/etc/shinken/certs/demoCA/serial rename to tools/docker/alignak_container/etc/shinken/certs/demoCA/serial diff --git a/tools/docker/shinken_container/etc/shinken/certs/demoCA/serial.old b/tools/docker/alignak_container/etc/shinken/certs/demoCA/serial.old similarity index 100% rename from tools/docker/shinken_container/etc/shinken/certs/demoCA/serial.old rename to tools/docker/alignak_container/etc/shinken/certs/demoCA/serial.old diff --git a/tools/docker/shinken_container/etc/shinken/certs/serial b/tools/docker/alignak_container/etc/shinken/certs/serial similarity index 100% rename from tools/docker/shinken_container/etc/shinken/certs/serial rename to tools/docker/alignak_container/etc/shinken/certs/serial diff --git a/tools/docker/shinken_container/etc/shinken/certs/serial.old b/tools/docker/alignak_container/etc/shinken/certs/serial.old similarity index 100% rename from tools/docker/shinken_container/etc/shinken/certs/serial.old rename to tools/docker/alignak_container/etc/shinken/certs/serial.old diff --git a/tools/docker/shinken_container/etc/shinken/certs/server.cert b/tools/docker/alignak_container/etc/shinken/certs/server.cert similarity index 100% rename from tools/docker/shinken_container/etc/shinken/certs/server.cert rename to tools/docker/alignak_container/etc/shinken/certs/server.cert diff --git a/tools/docker/shinken_container/etc/shinken/certs/server.key b/tools/docker/alignak_container/etc/shinken/certs/server.key similarity index 100% rename from tools/docker/shinken_container/etc/shinken/certs/server.key rename to tools/docker/alignak_container/etc/shinken/certs/server.key diff --git a/tools/docker/shinken_container/etc/shinken/certs/server.pem b/tools/docker/alignak_container/etc/shinken/certs/server.pem similarity index 100% rename from tools/docker/shinken_container/etc/shinken/certs/server.pem rename to tools/docker/alignak_container/etc/shinken/certs/server.pem diff --git a/tools/docker/shinken_container/etc/shinken/certs/server.req b/tools/docker/alignak_container/etc/shinken/certs/server.req similarity index 100% rename from tools/docker/shinken_container/etc/shinken/certs/server.req rename to tools/docker/alignak_container/etc/shinken/certs/server.req diff --git a/tools/docker/shinken_container/etc/shinken/certs/shinken_openssl_cnf b/tools/docker/alignak_container/etc/shinken/certs/shinken_openssl_cnf similarity index 100% rename from tools/docker/shinken_container/etc/shinken/certs/shinken_openssl_cnf rename to tools/docker/alignak_container/etc/shinken/certs/shinken_openssl_cnf diff --git a/tools/docker/shinken_container/etc/shinken/commands/check_dig.cfg b/tools/docker/alignak_container/etc/shinken/commands/check_dig.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/commands/check_dig.cfg rename to tools/docker/alignak_container/etc/shinken/commands/check_dig.cfg diff --git a/tools/docker/shinken_container/etc/shinken/commands/check_host_alive.cfg b/tools/docker/alignak_container/etc/shinken/commands/check_host_alive.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/commands/check_host_alive.cfg rename to tools/docker/alignak_container/etc/shinken/commands/check_host_alive.cfg diff --git a/tools/docker/shinken_container/etc/shinken/commands/check_http_url.cfg b/tools/docker/alignak_container/etc/shinken/commands/check_http_url.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/commands/check_http_url.cfg rename to tools/docker/alignak_container/etc/shinken/commands/check_http_url.cfg diff --git a/tools/docker/shinken_container/etc/shinken/commands/check_nrpe.cfg b/tools/docker/alignak_container/etc/shinken/commands/check_nrpe.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/commands/check_nrpe.cfg rename to tools/docker/alignak_container/etc/shinken/commands/check_nrpe.cfg diff --git a/tools/docker/shinken_container/etc/shinken/commands/check_nrpe_args.cfg b/tools/docker/alignak_container/etc/shinken/commands/check_nrpe_args.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/commands/check_nrpe_args.cfg rename to tools/docker/alignak_container/etc/shinken/commands/check_nrpe_args.cfg diff --git a/tools/docker/shinken_container/etc/shinken/commands/check_ping.cfg b/tools/docker/alignak_container/etc/shinken/commands/check_ping.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/commands/check_ping.cfg rename to tools/docker/alignak_container/etc/shinken/commands/check_ping.cfg diff --git a/tools/docker/shinken_container/etc/shinken/commands/check_snmp_service.cfg b/tools/docker/alignak_container/etc/shinken/commands/check_snmp_service.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/commands/check_snmp_service.cfg rename to tools/docker/alignak_container/etc/shinken/commands/check_snmp_service.cfg diff --git a/tools/docker/shinken_container/etc/shinken/commands/check_snmp_storage.cfg b/tools/docker/alignak_container/etc/shinken/commands/check_snmp_storage.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/commands/check_snmp_storage.cfg rename to tools/docker/alignak_container/etc/shinken/commands/check_snmp_storage.cfg diff --git a/tools/docker/shinken_container/etc/shinken/commands/check_snmp_time.cfg b/tools/docker/alignak_container/etc/shinken/commands/check_snmp_time.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/commands/check_snmp_time.cfg rename to tools/docker/alignak_container/etc/shinken/commands/check_snmp_time.cfg diff --git a/tools/docker/shinken_container/etc/shinken/commands/check_tcp.cfg b/tools/docker/alignak_container/etc/shinken/commands/check_tcp.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/commands/check_tcp.cfg rename to tools/docker/alignak_container/etc/shinken/commands/check_tcp.cfg diff --git a/tools/docker/shinken_container/etc/shinken/commands/configuration-check.cfg b/tools/docker/alignak_container/etc/shinken/commands/configuration-check.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/commands/configuration-check.cfg rename to tools/docker/alignak_container/etc/shinken/commands/configuration-check.cfg diff --git a/tools/docker/shinken_container/etc/shinken/commands/detailled-host-by-email.cfg b/tools/docker/alignak_container/etc/shinken/commands/detailled-host-by-email.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/commands/detailled-host-by-email.cfg rename to tools/docker/alignak_container/etc/shinken/commands/detailled-host-by-email.cfg diff --git a/tools/docker/shinken_container/etc/shinken/commands/detailled-service-by-email.cfg b/tools/docker/alignak_container/etc/shinken/commands/detailled-service-by-email.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/commands/detailled-service-by-email.cfg rename to tools/docker/alignak_container/etc/shinken/commands/detailled-service-by-email.cfg diff --git a/tools/docker/shinken_container/etc/shinken/commands/notify-host-by-android-sms.cfg b/tools/docker/alignak_container/etc/shinken/commands/notify-host-by-android-sms.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/commands/notify-host-by-android-sms.cfg rename to tools/docker/alignak_container/etc/shinken/commands/notify-host-by-android-sms.cfg diff --git a/tools/docker/shinken_container/etc/shinken/commands/notify-host-by-email.cfg b/tools/docker/alignak_container/etc/shinken/commands/notify-host-by-email.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/commands/notify-host-by-email.cfg rename to tools/docker/alignak_container/etc/shinken/commands/notify-host-by-email.cfg diff --git a/tools/docker/shinken_container/etc/shinken/commands/notify-host-by-xmpp.cfg b/tools/docker/alignak_container/etc/shinken/commands/notify-host-by-xmpp.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/commands/notify-host-by-xmpp.cfg rename to tools/docker/alignak_container/etc/shinken/commands/notify-host-by-xmpp.cfg diff --git a/tools/docker/shinken_container/etc/shinken/commands/notify-service-by-android-sms.cfg b/tools/docker/alignak_container/etc/shinken/commands/notify-service-by-android-sms.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/commands/notify-service-by-android-sms.cfg rename to tools/docker/alignak_container/etc/shinken/commands/notify-service-by-android-sms.cfg diff --git a/tools/docker/shinken_container/etc/shinken/commands/notify-service-by-email.cfg b/tools/docker/alignak_container/etc/shinken/commands/notify-service-by-email.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/commands/notify-service-by-email.cfg rename to tools/docker/alignak_container/etc/shinken/commands/notify-service-by-email.cfg diff --git a/tools/docker/shinken_container/etc/shinken/commands/notify-service-by-xmpp.cfg b/tools/docker/alignak_container/etc/shinken/commands/notify-service-by-xmpp.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/commands/notify-service-by-xmpp.cfg rename to tools/docker/alignak_container/etc/shinken/commands/notify-service-by-xmpp.cfg diff --git a/tools/docker/shinken_container/etc/shinken/commands/reload-shinken.cfg b/tools/docker/alignak_container/etc/shinken/commands/reload-shinken.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/commands/reload-shinken.cfg rename to tools/docker/alignak_container/etc/shinken/commands/reload-shinken.cfg diff --git a/tools/docker/shinken_container/etc/shinken/commands/restart-shinken.cfg b/tools/docker/alignak_container/etc/shinken/commands/restart-shinken.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/commands/restart-shinken.cfg rename to tools/docker/alignak_container/etc/shinken/commands/restart-shinken.cfg diff --git a/tools/docker/shinken_container/etc/shinken/contactgroups/admins.cfg b/tools/docker/alignak_container/etc/shinken/contactgroups/admins.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/contactgroups/admins.cfg rename to tools/docker/alignak_container/etc/shinken/contactgroups/admins.cfg diff --git a/tools/docker/shinken_container/etc/shinken/contactgroups/users.cfg b/tools/docker/alignak_container/etc/shinken/contactgroups/users.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/contactgroups/users.cfg rename to tools/docker/alignak_container/etc/shinken/contactgroups/users.cfg diff --git a/tools/docker/shinken_container/etc/shinken/contacts/admin.cfg b/tools/docker/alignak_container/etc/shinken/contacts/admin.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/contacts/admin.cfg rename to tools/docker/alignak_container/etc/shinken/contacts/admin.cfg diff --git a/tools/docker/shinken_container/etc/shinken/daemons/brokerd.ini b/tools/docker/alignak_container/etc/shinken/daemons/brokerd.ini similarity index 100% rename from tools/docker/shinken_container/etc/shinken/daemons/brokerd.ini rename to tools/docker/alignak_container/etc/shinken/daemons/brokerd.ini diff --git a/tools/docker/shinken_container/etc/shinken/daemons/pollerd.ini b/tools/docker/alignak_container/etc/shinken/daemons/pollerd.ini similarity index 100% rename from tools/docker/shinken_container/etc/shinken/daemons/pollerd.ini rename to tools/docker/alignak_container/etc/shinken/daemons/pollerd.ini diff --git a/tools/docker/shinken_container/etc/shinken/daemons/reactionnerd.ini b/tools/docker/alignak_container/etc/shinken/daemons/reactionnerd.ini similarity index 100% rename from tools/docker/shinken_container/etc/shinken/daemons/reactionnerd.ini rename to tools/docker/alignak_container/etc/shinken/daemons/reactionnerd.ini diff --git a/tools/docker/shinken_container/etc/shinken/daemons/receiverd.ini b/tools/docker/alignak_container/etc/shinken/daemons/receiverd.ini similarity index 100% rename from tools/docker/shinken_container/etc/shinken/daemons/receiverd.ini rename to tools/docker/alignak_container/etc/shinken/daemons/receiverd.ini diff --git a/tools/docker/shinken_container/etc/shinken/daemons/schedulerd.ini b/tools/docker/alignak_container/etc/shinken/daemons/schedulerd.ini similarity index 100% rename from tools/docker/shinken_container/etc/shinken/daemons/schedulerd.ini rename to tools/docker/alignak_container/etc/shinken/daemons/schedulerd.ini diff --git a/tools/docker/shinken_container/etc/shinken/dependencies/sample.cfg b/tools/docker/alignak_container/etc/shinken/dependencies/sample.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/dependencies/sample.cfg rename to tools/docker/alignak_container/etc/shinken/dependencies/sample.cfg diff --git a/tools/docker/shinken_container/etc/shinken/discovery/discovery.cfg b/tools/docker/alignak_container/etc/shinken/discovery/discovery.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/discovery/discovery.cfg rename to tools/docker/alignak_container/etc/shinken/discovery/discovery.cfg diff --git a/tools/docker/shinken_container/etc/shinken/discovery/discovery_rules.cfg b/tools/docker/alignak_container/etc/shinken/discovery/discovery_rules.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/discovery/discovery_rules.cfg rename to tools/docker/alignak_container/etc/shinken/discovery/discovery_rules.cfg diff --git a/tools/docker/shinken_container/etc/shinken/discovery/discovery_runs.cfg b/tools/docker/alignak_container/etc/shinken/discovery/discovery_runs.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/discovery/discovery_runs.cfg rename to tools/docker/alignak_container/etc/shinken/discovery/discovery_runs.cfg diff --git a/tools/docker/shinken_container/etc/shinken/escalations/sample.cfg b/tools/docker/alignak_container/etc/shinken/escalations/sample.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/escalations/sample.cfg rename to tools/docker/alignak_container/etc/shinken/escalations/sample.cfg diff --git a/tools/docker/shinken_container/etc/shinken/hostgroups/linux.cfg b/tools/docker/alignak_container/etc/shinken/hostgroups/linux.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/hostgroups/linux.cfg rename to tools/docker/alignak_container/etc/shinken/hostgroups/linux.cfg diff --git a/tools/docker/shinken_container/etc/shinken/hosts/localhost.cfg b/tools/docker/alignak_container/etc/shinken/hosts/localhost.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/hosts/localhost.cfg rename to tools/docker/alignak_container/etc/shinken/hosts/localhost.cfg diff --git a/tools/docker/shinken_container/etc/shinken/modules/auth_cfg_password.cfg b/tools/docker/alignak_container/etc/shinken/modules/auth_cfg_password.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/modules/auth_cfg_password.cfg rename to tools/docker/alignak_container/etc/shinken/modules/auth_cfg_password.cfg diff --git a/tools/docker/shinken_container/etc/shinken/modules/booster_nrpe.cfg b/tools/docker/alignak_container/etc/shinken/modules/booster_nrpe.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/modules/booster_nrpe.cfg rename to tools/docker/alignak_container/etc/shinken/modules/booster_nrpe.cfg diff --git a/tools/docker/shinken_container/etc/shinken/modules/influxdb.cfg b/tools/docker/alignak_container/etc/shinken/modules/influxdb.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/modules/influxdb.cfg rename to tools/docker/alignak_container/etc/shinken/modules/influxdb.cfg diff --git a/tools/docker/shinken_container/etc/shinken/modules/mongo-live-config.cfg b/tools/docker/alignak_container/etc/shinken/modules/mongo-live-config.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/modules/mongo-live-config.cfg rename to tools/docker/alignak_container/etc/shinken/modules/mongo-live-config.cfg diff --git a/tools/docker/shinken_container/etc/shinken/modules/mongodb.cfg b/tools/docker/alignak_container/etc/shinken/modules/mongodb.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/modules/mongodb.cfg rename to tools/docker/alignak_container/etc/shinken/modules/mongodb.cfg diff --git a/tools/docker/shinken_container/etc/shinken/modules/webui.cfg b/tools/docker/alignak_container/etc/shinken/modules/webui.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/modules/webui.cfg rename to tools/docker/alignak_container/etc/shinken/modules/webui.cfg diff --git a/tools/docker/shinken_container/etc/shinken/modules/ws_arbiter.cfg b/tools/docker/alignak_container/etc/shinken/modules/ws_arbiter.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/modules/ws_arbiter.cfg rename to tools/docker/alignak_container/etc/shinken/modules/ws_arbiter.cfg diff --git a/tools/docker/shinken_container/etc/shinken/notificationways/detailled-email.cfg b/tools/docker/alignak_container/etc/shinken/notificationways/detailled-email.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/notificationways/detailled-email.cfg rename to tools/docker/alignak_container/etc/shinken/notificationways/detailled-email.cfg diff --git a/tools/docker/shinken_container/etc/shinken/notificationways/email.cfg b/tools/docker/alignak_container/etc/shinken/notificationways/email.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/notificationways/email.cfg rename to tools/docker/alignak_container/etc/shinken/notificationways/email.cfg diff --git a/tools/docker/shinken_container/etc/shinken/notificationways/sms-android.cfg b/tools/docker/alignak_container/etc/shinken/notificationways/sms-android.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/notificationways/sms-android.cfg rename to tools/docker/alignak_container/etc/shinken/notificationways/sms-android.cfg diff --git a/tools/docker/shinken_container/etc/shinken/packs/readme.cfg b/tools/docker/alignak_container/etc/shinken/packs/readme.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/packs/readme.cfg rename to tools/docker/alignak_container/etc/shinken/packs/readme.cfg diff --git a/tools/docker/shinken_container/etc/shinken/pollers/poller-master.cfg b/tools/docker/alignak_container/etc/shinken/pollers/poller-master.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/pollers/poller-master.cfg rename to tools/docker/alignak_container/etc/shinken/pollers/poller-master.cfg diff --git a/tools/docker/shinken_container/etc/shinken/reactionners/reactionner-android-sms.cfg b/tools/docker/alignak_container/etc/shinken/reactionners/reactionner-android-sms.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/reactionners/reactionner-android-sms.cfg rename to tools/docker/alignak_container/etc/shinken/reactionners/reactionner-android-sms.cfg diff --git a/tools/docker/shinken_container/etc/shinken/reactionners/reactionner-master.cfg b/tools/docker/alignak_container/etc/shinken/reactionners/reactionner-master.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/reactionners/reactionner-master.cfg rename to tools/docker/alignak_container/etc/shinken/reactionners/reactionner-master.cfg diff --git a/tools/docker/shinken_container/etc/shinken/realms/all.cfg b/tools/docker/alignak_container/etc/shinken/realms/all.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/realms/all.cfg rename to tools/docker/alignak_container/etc/shinken/realms/all.cfg diff --git a/tools/docker/shinken_container/etc/shinken/receivers/receiver-master.cfg b/tools/docker/alignak_container/etc/shinken/receivers/receiver-master.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/receivers/receiver-master.cfg rename to tools/docker/alignak_container/etc/shinken/receivers/receiver-master.cfg diff --git a/tools/docker/shinken_container/etc/shinken/resource.d/active-directory.cfg b/tools/docker/alignak_container/etc/shinken/resource.d/active-directory.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/resource.d/active-directory.cfg rename to tools/docker/alignak_container/etc/shinken/resource.d/active-directory.cfg diff --git a/tools/docker/shinken_container/etc/shinken/resource.d/nmap.cfg b/tools/docker/alignak_container/etc/shinken/resource.d/nmap.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/resource.d/nmap.cfg rename to tools/docker/alignak_container/etc/shinken/resource.d/nmap.cfg diff --git a/tools/docker/shinken_container/etc/shinken/resource.d/paths.cfg b/tools/docker/alignak_container/etc/shinken/resource.d/paths.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/resource.d/paths.cfg rename to tools/docker/alignak_container/etc/shinken/resource.d/paths.cfg diff --git a/tools/docker/shinken_container/etc/shinken/resource.d/snmp.cfg b/tools/docker/alignak_container/etc/shinken/resource.d/snmp.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/resource.d/snmp.cfg rename to tools/docker/alignak_container/etc/shinken/resource.d/snmp.cfg diff --git a/tools/docker/shinken_container/etc/shinken/schedulers/scheduler-master.cfg b/tools/docker/alignak_container/etc/shinken/schedulers/scheduler-master.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/schedulers/scheduler-master.cfg rename to tools/docker/alignak_container/etc/shinken/schedulers/scheduler-master.cfg diff --git a/tools/docker/shinken_container/etc/shinken/servicegroups/sample.cfg b/tools/docker/alignak_container/etc/shinken/servicegroups/sample.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/servicegroups/sample.cfg rename to tools/docker/alignak_container/etc/shinken/servicegroups/sample.cfg diff --git a/tools/docker/shinken_container/etc/shinken/services/services.cfg b/tools/docker/alignak_container/etc/shinken/services/services.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/services/services.cfg rename to tools/docker/alignak_container/etc/shinken/services/services.cfg diff --git a/tools/docker/shinken_container/etc/shinken/shinken.cfg b/tools/docker/alignak_container/etc/shinken/shinken.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/shinken.cfg rename to tools/docker/alignak_container/etc/shinken/shinken.cfg diff --git a/tools/docker/shinken_container/etc/shinken/templates/generic-contact.cfg b/tools/docker/alignak_container/etc/shinken/templates/generic-contact.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/templates/generic-contact.cfg rename to tools/docker/alignak_container/etc/shinken/templates/generic-contact.cfg diff --git a/tools/docker/shinken_container/etc/shinken/templates/generic-host.cfg b/tools/docker/alignak_container/etc/shinken/templates/generic-host.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/templates/generic-host.cfg rename to tools/docker/alignak_container/etc/shinken/templates/generic-host.cfg diff --git a/tools/docker/shinken_container/etc/shinken/templates/generic-service.cfg b/tools/docker/alignak_container/etc/shinken/templates/generic-service.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/templates/generic-service.cfg rename to tools/docker/alignak_container/etc/shinken/templates/generic-service.cfg diff --git a/tools/docker/shinken_container/etc/shinken/templates/srv-pnp.cfg b/tools/docker/alignak_container/etc/shinken/templates/srv-pnp.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/templates/srv-pnp.cfg rename to tools/docker/alignak_container/etc/shinken/templates/srv-pnp.cfg diff --git a/tools/docker/shinken_container/etc/shinken/templates/time_templates.cfg b/tools/docker/alignak_container/etc/shinken/templates/time_templates.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/templates/time_templates.cfg rename to tools/docker/alignak_container/etc/shinken/templates/time_templates.cfg diff --git a/tools/docker/shinken_container/etc/shinken/timeperiods/24x7.cfg b/tools/docker/alignak_container/etc/shinken/timeperiods/24x7.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/timeperiods/24x7.cfg rename to tools/docker/alignak_container/etc/shinken/timeperiods/24x7.cfg diff --git a/tools/docker/shinken_container/etc/shinken/timeperiods/none.cfg b/tools/docker/alignak_container/etc/shinken/timeperiods/none.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/timeperiods/none.cfg rename to tools/docker/alignak_container/etc/shinken/timeperiods/none.cfg diff --git a/tools/docker/shinken_container/etc/shinken/timeperiods/us-holidays.cfg b/tools/docker/alignak_container/etc/shinken/timeperiods/us-holidays.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/timeperiods/us-holidays.cfg rename to tools/docker/alignak_container/etc/shinken/timeperiods/us-holidays.cfg diff --git a/tools/docker/shinken_container/etc/shinken/timeperiods/workhours.cfg b/tools/docker/alignak_container/etc/shinken/timeperiods/workhours.cfg similarity index 100% rename from tools/docker/shinken_container/etc/shinken/timeperiods/workhours.cfg rename to tools/docker/alignak_container/etc/shinken/timeperiods/workhours.cfg diff --git a/tools/docker/shinken_container/etc/supervisor/conf.d/supervisor.conf b/tools/docker/alignak_container/etc/supervisor/conf.d/supervisor.conf similarity index 88% rename from tools/docker/shinken_container/etc/supervisor/conf.d/supervisor.conf rename to tools/docker/alignak_container/etc/supervisor/conf.d/supervisor.conf index 6c68049..81815e0 100644 --- a/tools/docker/shinken_container/etc/supervisor/conf.d/supervisor.conf +++ b/tools/docker/alignak_container/etc/supervisor/conf.d/supervisor.conf @@ -1,7 +1,7 @@ [supervisord] nodaemon=true -[program:shinken] +[program:alignak] command=/bin/sh -c "service shinken start" [program:nrpe]