Commit 0beb96e240a1ad3546aab01d2b369f991c5b09cf

Authored by Earth Ugat
1 parent 4690c078

Version v0.1.3. Minor corrections. Also added cookbook-zabbix::agent_package.

@@ -8,7 +8,7 @@ cookbook 'backup-file2s3', git: 'https://gitlab.chromedia.com/ops/backup-file2s3 @@ -8,7 +8,7 @@ cookbook 'backup-file2s3', git: 'https://gitlab.chromedia.com/ops/backup-file2s3
8 cookbook 'cfe-nginx-php-fpm', git: 'https://gitlab.chromedia.com/ops/cfe-nginx-php-fpm.git', tag: 'v0.5.2' 8 cookbook 'cfe-nginx-php-fpm', git: 'https://gitlab.chromedia.com/ops/cfe-nginx-php-fpm.git', tag: 'v0.5.2'
9 cookbook 'cfe-simple-iptables', git: 'https://gitlab.chromedia.com/ops/cfe-simple-iptables.git', tag: 'v0.1.0' 9 cookbook 'cfe-simple-iptables', git: 'https://gitlab.chromedia.com/ops/cfe-simple-iptables.git', tag: 'v0.1.0'
10 10
11 -cookbook 'cookbook-letsencrypt', git: 'https://github.com/nollieheel/cookbook-letsencrypt.git', tag: 'v0.2.0' 11 +cookbook 'cookbook-letsencrypt', git: 'https://github.com/nollieheel/cookbook-letsencrypt.git', tag: 'v0.2.1'
12 cookbook 'cookbook-phpmyadmin', git: 'https://github.com/nollieheel/cookbook-phpmyadmin.git', tag: 'v0.1.0' 12 cookbook 'cookbook-phpmyadmin', git: 'https://github.com/nollieheel/cookbook-phpmyadmin.git', tag: 'v0.1.0'
13 cookbook 'cookbook-updater', git: 'https://github.com/nollieheel/cookbook-updater.git', tag: 'v0.2.0' 13 cookbook 'cookbook-updater', git: 'https://github.com/nollieheel/cookbook-updater.git', tag: 'v0.2.0'
14 cookbook 'cookbook-zabbix', git: 'https://github.com/nollieheel/cookbook-zabbix.git', tag: 'v1.0.1' 14 cookbook 'cookbook-zabbix', git: 'https://github.com/nollieheel/cookbook-zabbix.git', tag: 'v1.0.1'
  1 +## 0.1.3 - 2016-12-22
  2 +### Added
  3 +- Forgot to add 'cookbook-zabbix::agent_package' as part of the run chain.
  4 +
1 ## 0.1.2 - 2016-12-13 5 ## 0.1.2 - 2016-12-13
2 ### Changed 6 ### Changed
3 - Updated dependency versions. 7 - Updated dependency versions.
@@ -86,6 +86,8 @@ default[cb]['misc']['sshd']['conf_path'] = '/etc/ssh/sshd_config' @@ -86,6 +86,8 @@ default[cb]['misc']['sshd']['conf_path'] = '/etc/ssh/sshd_config'
86 86
87 default[cb]['web']['include_nginx'] = true 87 default[cb]['web']['include_nginx'] = true
88 88
  89 +default[cb]['monitor']['include_zabbix_agent'] = true
  90 +
89 # Wrapped attributes 91 # Wrapped attributes
90 92
91 rules_ssh = secret['iptables_ssh_ports'].inject([]) do |acc, sport| 93 rules_ssh = secret['iptables_ssh_ports'].inject([]) do |acc, sport|
@@ -4,7 +4,7 @@ maintainer_email 'sysadmin@chromedia.com' @@ -4,7 +4,7 @@ maintainer_email 'sysadmin@chromedia.com'
4 license 'Apache License' 4 license 'Apache License'
5 description 'Simplifies setting up common Linux servers.' 5 description 'Simplifies setting up common Linux servers.'
6 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) 6 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
7 -version '0.1.2' 7 +version '0.1.3'
8 8
9 %w{ 9 %w{
10 cfe-users cfe-mariadb 10 cfe-users cfe-mariadb
@@ -25,3 +25,4 @@ include_recipe "#{cookbook_name}::tls" @@ -25,3 +25,4 @@ include_recipe "#{cookbook_name}::tls"
25 include_recipe "#{cookbook_name}::app" 25 include_recipe "#{cookbook_name}::app"
26 include_recipe "#{cookbook_name}::misc" 26 include_recipe "#{cookbook_name}::misc"
27 include_recipe "#{cookbook_name}::web" 27 include_recipe "#{cookbook_name}::web"
  28 +include_recipe "#{cookbook_name}::monitor"
  1 +#
  2 +# Author:: Earth U (<sysadmin @ chromedia.com>)
  3 +# Cookbook Name:: cfe-server
  4 +# Recipes:: monitor
  5 +#
  6 +# Copyright 2016, Chromedia Far East, Inc.
  7 +#
  8 +# Licensed under the Apache License, Version 2.0 (the "License");
  9 +# you may not use this file except in compliance with the License.
  10 +# You may obtain a copy of the License at
  11 +#
  12 +# http://www.apache.org/licenses/LICENSE-2.0
  13 +#
  14 +# Unless required by applicable law or agreed to in writing, software
  15 +# distributed under the License is distributed on an "AS IS" BASIS,
  16 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  17 +# See the License for the specific language governing permissions and
  18 +# limitations under the License.
  19 +#
  20 +
  21 +if node[cookbook_name]['monitor']['include_zabbix_agent']
  22 + include_recipe 'cookbook-zabbix::agent_package'
  23 +end