From 84f6a6d1c31a8dd8cc610c9e23420ccad493f477 Mon Sep 17 00:00:00 2001
From: Julien Dessaux
Date: Tue, 13 Mar 2018 18:49:27 +0100
Subject: Removed deprecated ipam policy and cleaned reality remnants in nagios
 config

---
 .../nagios/conf.d/docker/miniflux.adyxax.org.cfg   |  2 +-
 .../nagios/conf.d/docker/phpipam.adyxax.org.cfg    |  2 +-
 templates/nagios/conf.d/hostgroups.cfg             |  9 +++-
 templates/nagios/conf.d/servers/collab.cfg         |  2 +-
 templates/nagios/conf.d/servers/myth.cfg           |  6 +++
 templates/nagios/conf.d/servers/reality.cfg        |  6 ---
 templates/nginx/ipam_nginx.conf                    | 62 ----------------------
 7 files changed, 16 insertions(+), 73 deletions(-)
 create mode 100644 templates/nagios/conf.d/servers/myth.cfg
 delete mode 100644 templates/nagios/conf.d/servers/reality.cfg
 delete mode 100644 templates/nginx/ipam_nginx.conf

(limited to 'templates')

diff --git a/templates/nagios/conf.d/docker/miniflux.adyxax.org.cfg b/templates/nagios/conf.d/docker/miniflux.adyxax.org.cfg
index 2243d50..7b9ab96 100644
--- a/templates/nagios/conf.d/docker/miniflux.adyxax.org.cfg
+++ b/templates/nagios/conf.d/docker/miniflux.adyxax.org.cfg
@@ -2,5 +2,5 @@ define host {
     use        workhours
     host_name  miniflux.adyxax.org
     address    miniflux
-    parents    reality.adyxax.org
+    parents    myth.adyxax.org
 }
diff --git a/templates/nagios/conf.d/docker/phpipam.adyxax.org.cfg b/templates/nagios/conf.d/docker/phpipam.adyxax.org.cfg
index ea8d270..8aee904 100644
--- a/templates/nagios/conf.d/docker/phpipam.adyxax.org.cfg
+++ b/templates/nagios/conf.d/docker/phpipam.adyxax.org.cfg
@@ -2,5 +2,5 @@ define host {
     use        workhours
     host_name  phpipam.adyxax.org
     address    phpipam
-    parents    reality.adyxax.org
+    parents    myth.adyxax.org
 }
diff --git a/templates/nagios/conf.d/hostgroups.cfg b/templates/nagios/conf.d/hostgroups.cfg
index e05049e..068bdd4 100644
--- a/templates/nagios/conf.d/hostgroups.cfg
+++ b/templates/nagios/conf.d/hostgroups.cfg
@@ -22,6 +22,11 @@ define hostgroup {
 define hostgroup {
     hostgroup_name  ubuntu-servers
     alias           Ubuntu Servers
-    members         collab.adyxax.org, \
-                    reality.adyxax.org
+    members         collab.adyxax.org
+}
+
+define hostgroup {
+    hostgroup_name  centos-servers
+    alias           Centos Servers
+    members         myth.adyxax.org
 }
diff --git a/templates/nagios/conf.d/servers/collab.cfg b/templates/nagios/conf.d/servers/collab.cfg
index 5f25243..0afba81 100644
--- a/templates/nagios/conf.d/servers/collab.cfg
+++ b/templates/nagios/conf.d/servers/collab.cfg
@@ -2,5 +2,5 @@ define host {
     use        workhours
     host_name  collab.adyxax.org
     address    collab
-    parents    cobsd.adyxax.org, reality.adyxax.org
+    parents    cobsd.adyxax.org
 }
diff --git a/templates/nagios/conf.d/servers/myth.cfg b/templates/nagios/conf.d/servers/myth.cfg
new file mode 100644
index 0000000..1159c14
--- /dev/null
+++ b/templates/nagios/conf.d/servers/myth.cfg
@@ -0,0 +1,6 @@
+define host {
+    use        workhours
+    host_name  myth.adyxax.org
+    address    myth
+    parents    cobsd.adyxax.org
+}
diff --git a/templates/nagios/conf.d/servers/reality.cfg b/templates/nagios/conf.d/servers/reality.cfg
deleted file mode 100644
index 7998e4d..0000000
--- a/templates/nagios/conf.d/servers/reality.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-define host {
-    use        workhours
-    host_name  reality.adyxax.org
-    address    reality
-    parents    cobsd.adyxax.org
-}
diff --git a/templates/nginx/ipam_nginx.conf b/templates/nginx/ipam_nginx.conf
deleted file mode 100644
index fe703ef..0000000
--- a/templates/nginx/ipam_nginx.conf
+++ /dev/null
@@ -1,62 +0,0 @@
-worker_processes  1;
-
-# This default error log path is compiled-in to make sure configuration parsing
-# errors are logged somewhere, especially during unattended boot when stderr
-# isn't normally logged anywhere. This path will be touched on every nginx
-# start regardless of error log location configured here. See
-# https://trac.nginx.org/nginx/ticket/147 for more info.
-#
-#error_log  /var/log/nginx/error.log;
-
-events {
-    worker_connections  1024;
-}
-
-http {
-    include       mime.types;
-    default_type  application/octet-stream;
-
-    sendfile        on;
-    keepalive_timeout  65;
-    gzip  on;
-
-    server {
-        listen       80;
-        server_name  localhost;
-
-        root   /var/www/phpipam/;
-
-        location ~ ^/(favicon.ico|robots.txt)$ {
-            access_log off;
-            expires max;
-        }
-        location ~ ^/(api/controllers|api/README|app|db|functions|install|misc|upgrade|INSTALL.txt|README|UPDATE)$ {
-            deny all;
-            access_log off;
-            log_not_found off;
-        }
-        location /nginx_status { stub_status on; access_log off; allow 127.0.0.1; deny all; }
-
-        location / {
-            index  index.php;
-            try_files $uri $uri/ index.php;
-        }
-
-        #error_page  404              /404.html;
-
-        # redirect server error pages to the static page /50x.html
-        error_page   500 502 503 504  /50x.html;
-        location = /50x.html {
-            root   /usr/local/www/nginx-dist;
-        }
-        location ~ \.php$ {
-            fastcgi_pass  unix:/var/run/php-fpm/php-fpm.sock;
-            fastcgi_index  index.php;
-            fastcgi_split_path_info  ^(.+\.php)(/.+)$;
-            fastcgi_param  SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            include  fastcgi_params;
-            fastcgi_pass_header  Authorization;
-        }
-    }
-}
-
-- 
cgit v1.2.3