Temp on

ivanoats · Oct 10, 2009 · d06def0 · d06def0
1 parent ea82c03
commit d06def0
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 48 deletions.
diff --git a/mysql.rb b/mysql.rb
@@ -34,9 +34,7 @@
     via :macports, 'mysql5-server'
   }
   provides 'mysql'
-  after {
-    if host.osx?
-      sudo "ln -s #{Babushka::MacportsHelper.prefix / 'lib/mysql5/bin/mysql*'} #{Babushka::MacportsHelper.prefix / 'bin/'}"
-    end
-  }
+  after :on => :osx do
+    sudo "ln -s #{Babushka::MacportsHelper.prefix / 'lib/mysql5/bin/mysql*'} #{Babushka::MacportsHelper.prefix / 'bin/'}"
+  end
 end
diff --git a/nginx.rb b/nginx.rb
@@ -88,33 +88,31 @@ def restart_nginx
       result "There is #{result ? 'something' : 'nothing'} listening on #{result ? result.scan(/[0-9.*]+[.:]80/).first : 'port 80'}", :result => result
     end
   }
-  meet {
-    if host.linux?
-      sudo '/etc/init.d/nginx start'
-    elsif host.osx?
-      log_error "launchctl should have already started nginx. Check /var/log/system.log for errors."
-    end
-  }
+  meet :on => :linux do
+    sudo '/etc/init.d/nginx start'
+  end
+  meet :on => :osx do
+    log_error "launchctl should have already started nginx. Check /var/log/system.log for errors."
+  end
 end
 
 dep 'webserver startup script' do
-  requires 'webserver installed', 'rcconf'
-  met? {
-    if host.linux?
-      shell("rcconf --list").val_for('nginx') == 'on'
-    elsif host.osx?
-      !sudo('launchctl list').val_for('org.nginx').blank?
-    end
-  }
-  meet {
-    if host.linux?
+  requires 'webserver installed'
+  on :linux do
+    requires 'rcconf'
+    met? { shell("rcconf --list").val_for('nginx') == 'on' }
+    meet {
       render_erb 'nginx/nginx.init.d.erb', :to => '/etc/init.d/nginx', :perms => '755', :sudo => true
       sudo 'update-rc.d nginx defaults'
-    elsif host.osx?
+    }
+  end
+  on :osx do
+    met? { !sudo('launchctl list').val_for('org.nginx').blank? }
+    meet {
       render_erb 'nginx/nginx.launchd.erb', :to => '/Library/LaunchDaemons/org.nginx.plist', :sudo => true
       sudo 'launchctl load -w /Library/LaunchDaemons/org.nginx.plist'
-    end
-  }
+    }
+  end
 end
 
 dep 'webserver configured' do

diff --git a/postgres.rb b/postgres.rb
@@ -46,14 +46,12 @@
     via :apt, %w[postgresql postgresql-client libpq-dev]
   }
   provides 'psql'
-  after {
-    if host.osx?
-      sudo "ln -s #{Babushka::MacportsHelper.prefix / "lib/postgresql83/bin/*"} #{Babushka::MacportsHelper.prefix / 'bin/'}"
+  on :osx, after do
+    sudo "ln -s #{Babushka::MacportsHelper.prefix / "lib/postgresql83/bin/*"} #{Babushka::MacportsHelper.prefix / 'bin/'}"
 
-      sudo "mkdir -p /opt/local/var/db/postgresql83/defaultdb" and
-      sudo "chown postgres:postgres /opt/local/var/db/postgresql83/defaultdb" and
-      sudo "su postgres -c '/opt/local/lib/postgresql83/bin/initdb -D /opt/local/var/db/postgresql83/defaultdb'" and
-      sudo "launchctl load -w /Library/LaunchDaemons/org.macports.postgresql83-server.plist"
-    end
-  }
+    sudo "mkdir -p /opt/local/var/db/postgresql83/defaultdb" and
+    sudo "chown postgres:postgres /opt/local/var/db/postgresql83/defaultdb" and
+    sudo "su postgres -c '/opt/local/lib/postgresql83/bin/initdb -D /opt/local/var/db/postgresql83/defaultdb'" and
+    sudo "launchctl load -w /Library/LaunchDaemons/org.macports.postgresql83-server.plist"
+  end
 end
diff --git a/system.rb b/system.rb
@@ -54,7 +54,7 @@ def ssh_conf_path file
   }
 end
 
-dep 'tmp cleaning grace period', :for => :linux do
+dep 'tmp cleaning grace period', :for => :ubuntu do
   met? { !grep(/^[^#]*TMPTIME=0/, "/etc/default/rcS") }
   meet { change_line "TMPTIME=0", "TMPTIME=30", "/etc/default/rcS" }
 end
diff --git a/user.rb b/user.rb
@@ -8,7 +8,7 @@
   requires 'ncurses', 'doc', 'coreutils', 'sed'
   source "git://github.com/benhoskings/fish.git"
   preconfigure { shell "autoconf" }
-  configure_env "LDFLAGS='-liconv -L/opt/local/lib'" if host.osx?
+  configure_env { on :osx, "LDFLAGS='-liconv -L/opt/local/lib'" }
   configure_args "--without-xsel"
   after { append_to_file which('fish'), '/etc/shells' }
 end
@@ -36,16 +36,15 @@
 end
 
 dep 'user exists' do
-  met? {
-    if host.linux?
-      grep(/^#{var(:username)}:/, '/etc/passwd')
-    elsif host.osx?
-      !shell("dscl . -list /Users").split("\n").grep(var(:username)).empty?
-    end
-  }
-  meet {
-    sudo "mkdir -p #{var :home_dir_base}" and
-    sudo "useradd #{var(:username)} -m -s /bin/bash -b #{var :home_dir_base} -G admin" and
-    sudo "chmod 701 #{var(:home_dir_base) / var(:username)}"
-  }
+  on :osx do
+    met? { !shell("dscl . -list /Users").split("\n").grep(var(:username)).empty? }
+  end
+  on :linux do
+    met? { grep(/^#{var(:username)}:/, '/etc/passwd') }
+    meet {
+      sudo "mkdir -p #{var :home_dir_base}" and
+      sudo "useradd #{var(:username)} -m -s /bin/bash -b #{var :home_dir_base} -G admin" and
+      sudo "chmod 701 #{var(:home_dir_base) / var(:username)}"
+    }
+  end
 end