1.0.6 - Read Changelog

CHANGELOG.md

@@ -1,6 +1,11 @@
 ##CHANGE LOG
 ---
 
+##1.0.6 - 03/17/2017 - Levon Becker
+* Moved attributes out of default to own matching attributes file. Easier to add/remove functions and find attributes I'm looking for.
+* Added Sendmail recipe call, but nothing in it yet.
+* Removed Code Climate. Really that's good for like a Ruby Gem. Not so much for a cookbook. Especially because I'm not going to write rspec tests.
+
 ##1.0.5 - 03/16/2017 - Levon Becker
 * Added cfn-init.log and cfn-init-cmd.log to Cloudwatch Logs Stream
 

README.md

@@ -1,6 +1,5 @@
 # Bonusbits Mediawiki on Nginx in AWS Chef Cookbook and CloudFormation Template
 [![CircleCI](https://circleci.com/gh/bonusbits/bonusbits_mediawiki_nginx.svg?style=shield)](https://circleci.com/gh/bonusbits/bonusbits_mediawiki_nginx)
-[![Code Climate](https://codeclimate.com/github/bonusbits/bonusbits_mediawiki_nginx/badges/gpa.svg)](https://codeclimate.com/github/bonusbits/bonusbits_mediawiki_nginx)
 [![Join the chat at https://gitter.im/bonusbits/bonusbits_mediawiki_nginx](https://badges.gitter.im/bonusbits/bonusbits_mediawiki_nginx.svg)](https://gitter.im/bonusbits/bonusbits_mediawiki_nginx?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 # Purpose

attributes/adsense.rb

@@ -0,0 +1 @@
+default['bonusbits_mediawiki_nginx']['adsense']['configure'] = true

attributes/cloudwatch_logs.rb

@@ -0,0 +1 @@
+default['bonusbits_mediawiki_nginx']['cloudwatch_logs']['configure'] = true

attributes/default.rb

@@ -7,20 +7,6 @@
     'dev'
   end
 
-default['bonusbits_mediawiki_nginx'].tap do |root|
-  # CloudWatch Logs
-  root['cloudwatch_logs']['configure'] = true
-
-  # Data Bag
-  root['data_bag'] = 'bonusbits_mediawiki_nginx'
-  root['data_bag_item'] = 'example_databag_item'
-
-  # EFS
-  root['efs']['configure'] = true
-
-  # Log Rotate
-  root['logrotate']['configure'] = true
-
-  # Google AdSense
-  root['adsense']['configure'] = false
-end
+# Data Bags
+default['bonusbits_mediawiki_nginx']['data_bag'] = 'bonusbits_mediawiki_nginx'
+default['bonusbits_mediawiki_nginx']['data_bag_item'] = 'example_databag_item'

attributes/efs.rb

@@ -0,0 +1 @@
+default['bonusbits_mediawiki_nginx']['efs']['configure'] = true

attributes/logrotate.rb

@@ -0,0 +1 @@
+default['bonusbits_mediawiki_nginx']['logrotate']['configure'] = true

attributes/sendmail.rb

@@ -0,0 +1 @@
+default['bonusbits_mediawiki_nginx']['sendmail']['configure'] = true

circle.yml

@@ -3,8 +3,6 @@ machine:
     version: '2.3.1'
   timezone:
     America/Los_Angeles
-  environment:
-    CODECLIMATE_REPO_TOKEN: bc471ba6d3548276f87ec72cafbd264a119b84bb161371569296dec7a330f8b0
 
 dependencies:
   override:

cloudformation/bonusbits-mediawiki-nginx.yml

@@ -610,9 +610,6 @@ Resources:
                                "configure": ${UpdateDNS},
                                "hosted_zone_id": "${HostedZoneId}",
                                "record_name": "${RecordName}"
-                           },
-                           "adsense": {
-                               "configure": true
                            }
                        }
                    }

metadata.rb

@@ -4,7 +4,7 @@
 license 'MIT'
 description 'Deploy Mediawiki on Amazon Linux running Nginx and Php-fpm'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version '1.0.5'
+version '1.0.6'
 issues_url 'https://github.com/bonusbits/bonusbits_mediawiki_nginx/issues'
 source_url 'https://github.com/bonusbits/bonusbits_mediawiki_nginx'
 

recipes/default.rb

@@ -39,7 +39,7 @@
 include_recipe 'bonusbits_mediawiki_nginx::mediawiki'
 
 # Setup Sendmail
-# include_recipe 'bonusbits_mediawiki_nginx::sendmail' if node['bonusbits_mediawiki_nginx']['sendmail']['configure']
+include_recipe 'bonusbits_mediawiki_nginx::sendmail' if node['bonusbits_mediawiki_nginx']['sendmail']['configure']
 
 # Deploy Node Info Script
 include_recipe 'bonusbits_mediawiki_nginx::node_info' if node['bonusbits_mediawiki_nginx']['node_info']['deploy']

test/environments/example_environment.json

@@ -30,9 +30,6 @@
                 "configure": true,
                 "hosted_zone_id": "V2UYT8USYGG8F8",
                 "record_name": "www.example.com"
-            },
-            "adsense": {
-                "configure": true
             }
         }
     }

test/integration/default/inspec/cloudwatch_logs_spec.rb

@@ -10,15 +10,6 @@
   it 'Deploy awslogs.conf' do
     expect(file('/etc/awslogs/awslogs.conf')).to exist
   end
-  it 'Deploy publish-squid-metrics' do
-    expect(file('/usr/sbin/publish-squid-metrics')).to exist
-  end
-  it 'Rotate Squid Logs Cron Job' do
-    have_entry(cron('0 0 * * * squid -k rotate')).with_user('root')
-  end
-  it 'Publish Metrics Cron Job' do
-    have_entry(cron('*/5 * * * * bash /usr/sbin/publish-squid-metrics')).with_user('root')
-  end
   it 'AWS LOGS Service Enabled' do
     expect(service('awslogs')).to be_enabled
   end

test/integration/default/inspec/default_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'bonusbits_mediawiki_nginx::default' do
-  it 'Security Patch Cron Job Created' do
+  it 'Include CloudWatch Logs Recipe' do
     have_entry(cron('0 0 * * * yum -y update --security')).with_user('root')
   end
 end

test/integration/default/inspec/packages_spec.rb

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+web_package_list = %w(
+  apr
+  apr-util
+  enchant
+  git
+  ImageMagick
+  json-c
+  mysql56
+  nginx
+  openssl
+  openssl-devel
+  pcre
+  perl-core perl-CPAN
+  perl-Crypt-SSLeay
+  perl-DateTime
+  perl-libwww-perl
+  perl-Sys-Syslog
+  php70-cli
+  php70-common
+  php70-enchant
+  php70-fpm
+  php70-intl
+  php70-mbstring
+  php70-mcrypt
+  php70-mysqlnd
+  php70-pdo
+  php70-pecl-apcu
+  php70-pecl-imagick
+  php70-process
+  php70-xml
+  texlive
+)
+
+other_package_list = %w(
+  htop
+  mlocate
+  vim
+)
+
+describe 'bonusbits_mediawiki_nginx::packages' do
+  it 'Web Packages Installed' do
+    web_package_list.each do |package|
+      expect(package(package)).to be_installed
+    end
+  end
+  it 'Other Packages Installed' do
+    other_package_list.each do |package|
+      expect(package(package)).to be_installed
+    end
+  end
+end