Skip to content
This repository has been archived by the owner on Nov 30, 2017. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rubygems/rubygems-aws
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b95d8a16e1f0
Choose a base ref
...
head repository: rubygems/rubygems-aws
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e9187191a199
Choose a head ref
  • 2 commits
  • 7 files changed
  • 2 contributors

Commits on Dec 12, 2013

  1. Copy the full SHA
    ba5511e View commit details
  2. Merge pull request #152 from dwradcliffe/simplify-roles

    Cleanup and simplify roles
    Sam Kottler committed Dec 12, 2013
    Copy the full SHA
    e918719 View commit details
Showing with 31 additions and 64 deletions.
  1. +31 −6 chef/roles/base.rb
  2. +0 −7 chef/roles/logging.rb
  3. +0 −6 chef/roles/mailer.rb
  4. +0 −16 chef/roles/monitoring.rb
  5. +0 −10 chef/roles/security.rb
  6. +0 −7 chef/roles/shell.rb
  7. +0 −12 chef/roles/system_tools.rb
37 changes: 31 additions & 6 deletions chef/roles/base.rb
Original file line number Diff line number Diff line change
@@ -6,12 +6,34 @@
"recipe[build-essential]",
"recipe[rubygems::cloudinit]",
"recipe[xfs]",
"role[system_tools]",
"role[logging]",
"role[shell]",
"role[security]",
"role[monitoring]",
"role[mailer]"
"recipe[curl]",
"recipe[ntp]",
"recipe[hostname]",
"recipe[resolver]",
"recipe[rsync]",
"recipe[rubygems::system_ruby]",
"recipe[xml]",
"recipe[xslt]",
"recipe[logrotate]",
"recipe[logwatch]",
"recipe[rubygems::papertrail]",
"recipe[bash-completion]",
"recipe[grc]",
"recipe[screen]",
"recipe[openssh]",
"recipe[sudo]",
"recipe[denyhosts]",
"recipe[iptables]",
"recipe[rubygems::ip_security]",
"recipe[rubygems::iptables]",
"recipe[htop]",
"recipe[iftop]",
"recipe[monit]",
"recipe[newrelic-sysmond]",
"recipe[munin]",
"recipe[rubygems::datadog]",
"recipe[postfix]",
"recipe[postfix::aliases]"
)

default_attributes(
@@ -30,6 +52,9 @@
"cron", "filesystem", "ntp", "postfix"
]
},
"new_relic" => {
"license_key" => ""
},
"nginx" => {
"status_port" => 81
},
7 changes: 0 additions & 7 deletions chef/roles/logging.rb

This file was deleted.

6 changes: 0 additions & 6 deletions chef/roles/mailer.rb

This file was deleted.

16 changes: 0 additions & 16 deletions chef/roles/monitoring.rb

This file was deleted.

10 changes: 0 additions & 10 deletions chef/roles/security.rb

This file was deleted.

7 changes: 0 additions & 7 deletions chef/roles/shell.rb

This file was deleted.

12 changes: 0 additions & 12 deletions chef/roles/system_tools.rb

This file was deleted.