Merge branch 'master' of github.com:diaspora/diaspora

This commit is contained in:
maxwell 2010-11-17 12:08:23 -08:00
commit b643046b5b
2 changed files with 13 additions and 2 deletions

View file

@ -10,6 +10,9 @@ end
execute "ssl lib" do
command "yum install -y openssl-devel"
end
execute "htop" do
command "yum install -y htop psmisc screen"
end
def harden_ruby(ruby_string)
Dir.glob("/usr/local/rvm/wrappers/#{ruby_string}/*").each do |file|

View file

@ -6,10 +6,18 @@ execute "Untar splunk" do
command "cd /tmp/install && tar -xvf splunk-4.1.5-85165-Linux-x86_64.tgz"
end
execute "Remove old splunk" do
command "rm -rf /opt/splunk"
end
execute "Install splunk" do
command "mv /tmp/install/splunk /opt/splunk"
end
execute "Start splunk" do
command "cd /opt/splunk/bin && ./splunk start --accept-license"
end
execute "Put splunk into forwarding mode" do
command "cd /opt/splunk/bin && ./splunk enable app SplunkLightForwarder -auth admin:changeme"
end
@ -18,6 +26,6 @@ execute "Add forwarding server" do
command "cd /opt/splunk/bin && ./splunk add forward-server splunk.joindiaspora.com:9997 -auth admin:changeme"
end
execute "Start splunk" do
command "cd /opt/splunk/bin && ./splunk start"
execute "Add monitor for diaspora" do
command "cd /opt/splunk/bin && ./splunk add monitor /usr/local/app/diaspora/log"
end