Cherokee - use proper etc and var locations.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>

1 files changed, 22 insertions, 16 deletions

diff --git a/Library/Formula/cherokee.rb b/Library/Formula/cherokee.rb
index 0473887b8..87c679b5e 100644
--- a/Library/Formula/cherokee.rb
+++ b/Library/Formula/cherokee.rb
@@ -12,25 +12,31 @@ class Cherokee <Formula
   skip_clean "var/lib/cherokee/graphs/images"
 
   def caveats
-  <<-EOS.undent
-    Cherokee is setup to run with your (#{ENV['USER']}) permissions as part of the www group
-    on port 80. This can be changed in the cherokee-admin but be aware the new user will need
-    permissions to write to #{var} for logging and runtime files.
-
-    If this is your first install, automatically load on startup with:
-        sudo cp #{prefix}/org.cherokee.webserver.plist /System/Library/LaunchDaemons
-        sudo launchctl load -w /System/Library/LaunchDaemons/org.cherokee.webserver.plist
-
-    If this is an upgrade and you already have the org.cherokee.webserver.plist loaded:
-        sudo launchctl unload -w /System/Library/LaunchDaemons/org.cherokee.webserver.plist
-        sudo cp #{prefix}/org.cherokee.webserver.plist /System/Library/LaunchDaemons
-        sudo launchctl load -w /System/Library/LaunchDaemons/org.cherokee.webserver.plist
-  EOS
+    <<-EOS.undent
+      Cherokee is setup to run with your user permissions as part of the
+      www group on port 80. This can be changed in the cherokee-admin
+      but be aware the new user will need permissions to write to:
+        #{var}/cherokee
+      for logging and runtime files.
+
+       If this is your first install, automatically load on startup with:
+          cp #{prefix}/org.cherokee.webserver.plist ~/Library/LaunchDaemons
+          launchctl load -w ~/Library/LaunchDaemons/org.cherokee.webserver.plist
+
+      If this is an upgrade and you already have the plist loaded:
+          launchctl unload -w ~/Library/LaunchDaemons/org.cherokee.webserver.plist
+          cp #{prefix}/org.cherokee.webserver.plist ~/Library/LaunchDaemons
+          launchctl load -w ~/Library/LaunchDaemons/org.cherokee.webserver.plist
+    EOS
   end
 
   def install
-    system "./configure", "--prefix=#{prefix}", "--disable-debug", "--disable-dependency-tracking",
-           "--with-wwwuser=#{ENV['USER']}", "--with-wwwgroup=www"
+    system "./configure", "--disable-dependency-tracking",
+                          "--prefix=#{prefix}",
+                          "--sysconfdir=#{etc}",
+                          "--localstatedir=#{var}/cherokee",
+                          "--with-wwwuser=#{ENV['USER']}",
+                          "--with-wwwgroup=www"
     system "make install"
 
     prefix.install "org.cherokee.webserver.plist"