add meg commands

rubygems · Jul 18, 2014 · 60bd6c4 · 60bd6c4
1 parent 96c8e76
commit 60bd6c4
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 3 deletions.
diff --git a/Berksfile.lock b/Berksfile.lock
@@ -265,7 +265,7 @@ GRAPH
     slack_handler (>= 0.0.0)
   rubygems-ntp (0.0.1)
     ntp (>= 0.0.0)
-  rubygems-people (0.0.22)
+  rubygems-people (0.0.26)
     sudo (>= 0.0.0)
     user (>= 0.0.0)
   rubygems-redis (0.0.3)

diff --git a/cookbooks/rubygems-people/metadata.rb b/cookbooks/rubygems-people/metadata.rb
@@ -2,7 +2,7 @@
 maintainer       'RubyGems.org Ops Team'
 license          'MIT'
 description      'RubyGems user recipes'
-version          '0.0.22'
+version          '0.0.26'
 
 depends 'user'
 depends 'sudo'

diff --git a/cookbooks/rubygems-people/recipes/default.rb b/cookbooks/rubygems-people/recipes/default.rb
@@ -5,6 +5,9 @@
 
 include_recipe 'user'
 
+meg_balancer_host = search(:node, "roles:balancer AND chef_environment:#{node.chef_environment}")[0]['ipaddress']
+meg_app_host = search(:node, "roles:app AND chef_environment:#{node.chef_environment}")[0]['ipaddress']
+
 users = data_bag('users')
 sysadmins = []
 users.each do |user_name|
@@ -31,7 +34,9 @@
       owner user['username']
       group user['username']
       variables(
-        environment: node.chef_environment
+        environment: node.chef_environment,
+        meg_balancer_host: meg_balancer_host,
+        meg_app_host: meg_app_host
       )
     end
 
@@ -49,3 +54,5 @@
 
 node.default['authorization']['sudo']['groups'] = ['sysadmin']
 include_recipe 'sudo'
+
+include_recipe 'rubygems-people::meg'
diff --git a/cookbooks/rubygems-people/recipes/meg.rb b/cookbooks/rubygems-people/recipes/meg.rb
@@ -0,0 +1,14 @@
+#
+# Cookbook Name:: rubygems-bastion
+# Recipe:: meg
+#
+
+git '/opt/meg' do
+  repository 'https://github.com/rubygems/meg'
+  reference 'chef'
+  action :sync
+end
+
+link '/usr/bin/meg' do
+  to '/opt/meg/bin/meg'
+end
diff --git a/cookbooks/rubygems-people/templates/default/bashrc.erb b/cookbooks/rubygems-people/templates/default/bashrc.erb
@@ -95,3 +95,7 @@ if ! shopt -oq posix; then
     . /etc/bash_completion
   fi
 fi
+
+# export hostnames for use in meg commands
+export MEG_BALANCER_HOST=<%= @meg_balancer_host %>
+export MEG_APP_HOST=<%= @meg_app_host %>