diff options
| author | Julien Dessaux | 2018-03-13 18:49:27 +0100 |
|---|---|---|
| committer | Julien Dessaux | 2018-03-13 18:49:56 +0100 |
| commit | 84f6a6d1c31a8dd8cc610c9e23420ccad493f477 (patch) | |
| tree | 643f5458f8a940cd495f2626ee71870c87f2fd1d /services | |
| parent | Ensure sshd is running on linux servers (diff) | |
| download | masterfiles-84f6a6d1c31a8dd8cc610c9e23420ccad493f477.tar.gz masterfiles-84f6a6d1c31a8dd8cc610c9e23420ccad493f477.tar.bz2 masterfiles-84f6a6d1c31a8dd8cc610c9e23420ccad493f477.zip | |
Removed deprecated ipam policy and cleaned reality remnants in nagios config
Diffstat (limited to 'services')
| -rw-r--r-- | services/applications.cf | 1 | ||||
| -rw-r--r-- | services/applications/ipam.cf | 41 | ||||
| -rw-r--r-- | services/main.cf | 2 |
3 files changed, 0 insertions, 44 deletions
diff --git a/services/applications.cf b/services/applications.cf index 2c66ca8..a9910b9 100644 --- a/services/applications.cf +++ b/services/applications.cf @@ -4,7 +4,6 @@ body file control "services/applications/bareos_fd.cf", "services/applications/check_mk.cf", "services/applications/fcgiwrap.cf", - "services/applications/ipam.cf", "services/applications/nagios.cf", "services/applications/nginx.cf", "services/applications/nrpe.cf", diff --git a/services/applications/ipam.cf b/services/applications/ipam.cf deleted file mode 100644 index 067cb29..0000000 --- a/services/applications/ipam.cf +++ /dev/null @@ -1,41 +0,0 @@ -bundle agent ipam -{ - vars: - ipam:: - "config[host]" string => "mysql01"; - "config[user]" string => "phpipam"; - "config[pass]" string => "Hee0Hai8lie2gaaBia8xaisieSiengie"; - "config[name]" string => "phpipam"; - "config[port]" string => "3306"; - "index" slist => getindices("ipam.config"); - "packages" slist => { - "pear", - "php56-filter", - "php56-gettext", - "php56-gd", - "php56-gmp", - "php56-json", - "php56-mbstring", - "php56-openssl", - "php56-pdo_mysql", - "php56-session", - "php56-simplexml", - "php56-sockets", - }; - methods: - ipam:: - "ipam" usebundle => install_package("$(this.bundle)", "$(ipam.packages)"); - "ipam" usebundle => fcgiwrap("nobody", "www", "770"); - "ipam" usebundle => php56(); - "ipam" usebundle => nginx("$(sys.inputdir)/templates/nginx/ipam_nginx.conf", "nginx.conf"); - files: - ipam:: - "/var/www/phpipam/config.php" - create => "true", - perms => system_owned("444"), - edit_line => regex_replace("\$db\['$(index)'\]\s+=\s+\"(?!$(config[$(index)]))[^\"]+\";", "$db['$(index)'] = \"$(config[$(index)])\";"), - classes => if_repaired("ipam_ipam_config_php_repaired"); - reports: - any:: - "$(this.bundle): /var/www/phpipam/config.php repaired" ifvarclass => "ipam_ipam_config_php_repaired"; -} diff --git a/services/main.cf b/services/main.cf index 45d7521..786524e 100644 --- a/services/main.cf +++ b/services/main.cf @@ -48,8 +48,6 @@ bundle common classify bundle agent main { methods: - ipam:: - "ipam" usebundle => ipam; nagios:: "nagios" usebundle => nagios; } |