Parameterise username in 'rack.logrotate', passing it in from 'rack a…

…pp'.
benhoskings · Feb 7, 2012 · e14b826 · e14b826
1 parent 5a0166b
commit e14b826
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/logrotate.rb b/logrotate.rb
@@ -25,7 +25,7 @@ def conf_dest
   as "nginx"
 end
 
-dep 'rack.logrotate' do
+dep 'rack.logrotate', :username do
   renders "logrotate/rack.conf"
-  as var(:username)
+  as username
 end
diff --git a/logrotate/rack.conf b/logrotate/rack.conf
@@ -1,4 +1,4 @@
-/srv/http/<%= var :username %>/current/log/*.log {
+/srv/http/<%= username %>/current/log/*.log {
   daily
   missingok
   rotate 7

diff --git a/top level.rb b/top level.rb
@@ -29,7 +29,7 @@
   requires 'webapp'.with('unicorn', domain, domain_aliases, username, path, listen_host, listen_port, nginx_prefix, enable_ssl, force_ssl)
   requires 'web repo'.with(path)
   requires 'app bundled'.with(path, env)
-  requires 'rack.logrotate'
+  requires 'rack.logrotate'.with(username)
 end
 
 dep 'proxied app' do