zena 0.16.8 → 0.16.9

data/History.txt

@@ -1,3 +1,9 @@
+== 0.16.9 2010-09-29
+
+* 1 major enhancement
+  * fixed deploy rules for mongrel and passenger
+  * fixed RubyLess dependency (breaks with newer versions)
+
 == 0.16.8 2010-08-30
 
 * 1 minor enhancement

data/config/deploy.rb

@@ -9,8 +9,9 @@ set :repository,          "http://svn.zenadmin.org/zena/trunk"
 if self[:server_ip]
   #================= ADVANCED SETTINGS =============#
 
-  set :deploy_to,    "/var/zena"
-  set :sites_root,   "/var/www/zena"
+  set :deploy_to,    "/home/#{db_name}/app"
+  set :sites_root,   "/home/#{db_name}/sites"
+
   set :vhost_root,   "/etc/apache2/sites-available"
   set :deflate,       true
   set :debug_deflate, false
@@ -40,6 +41,10 @@ if self[:server_ip]
     require deploy_path
   else
     # Zena app, using zena as gem
+    env = File.read(File.join(File.dirname(__FILE__), 'environment.rb'))
+    if env =~ /config.gem.*zena.*version.*'(.*?)'/
+      gem 'zena', "= #{$1}"
+    end
     require 'zena/deploy'
   end
 

data/config/gems.yml

@@ -1,7 +1,7 @@
 hpricot:
 gettext:        '>= 1.93.0'
 querybuilder:   '= 0.5.9'
-rubyless:       '>= 0.3.5'
+rubyless:       '= 0.3.5'
 ruby-recaptcha: '= 1.0.0'
 syntax:         '= 1.0.0'
 tzinfo:         '>= 0.3.12'

data/db/schema.rb

@@ -80,19 +80,6 @@ ActiveRecord::Schema.define(:version => 20100115134729) do
     t.decimal  "value_b",    :precision => 24, :scale => 8
   end
 
-  create_table "delayed_jobs", :force => true do |t|
-    t.integer  "priority",   :default => 0
-    t.integer  "attempts",   :default => 0
-    t.text     "handler"
-    t.text     "last_error"
-    t.datetime "run_at"
-    t.datetime "locked_at"
-    t.datetime "failed_at"
-    t.string   "locked_by"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
   create_table "discussions", :force => true do |t|
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -189,7 +176,6 @@ ActiveRecord::Schema.define(:version => 20100115134729) do
     t.integer  "custom_a"
     t.integer  "custom_b"
     t.text     "vhash"
-    t.boolean  "delta",                       :default => true,  :null => false
   end
 
   create_table "relations", :force => true do |t|

data/lib/zena/deploy.rb

@@ -30,14 +30,20 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   set :templates, File.join(File.dirname(__FILE__), 'deploy')
   self[:app_type]   ||= :mongrel
-  self[:app_root]   ||= '/var/zena/current'
-  self[:sites_root] ||= '/var/www/zena'
+
+  self[:deploy_to]  ||= "/home/#{db_name}/app"
+  self[:sites_root] ||= "/home/#{db_name}/sites"
+  self[:dump_root]  ||= "/home/#{db_name}/dump"
+
+  self[:app_root]   ||= "#{deploy_to}/current"
+
   self[:balancer]   ||= db_name
+  self[:db_user]    ||= db_name
   self[:runner]     ||= 'root'
   self[:on_stop]    = []
   self[:on_start]   = []
 
-  set :in_current, "cd #{deploy_to}/current &&"
+  set :in_current, "cd #{app_root} &&"
 
   class RenderClass
     def initialize(path)
@@ -67,12 +73,29 @@ Capistrano::Configuration.instance(:must_exist).load do
     self[:on_start] << block
   end
 
+  def ancestry(path)
+    # Build directory ancestry ['/a', '/a/b', '/a/b/c']
+    paths = path.split('/')[1..-1].inject(['']) do |res, cur|
+      res << (res.last + "/#{cur}")
+      res
+    end[1..-1]
+  end
+
   #========================== SOURCE CODE   =========================#
 
 
   desc "set permissions to www-data"
   task :set_permissions, :roles => :app do
-    run "chown -R www-data:www-data #{deploy_to}/current/public #{deploy_to}/current/log #{deploy_to}/current/tmp"
+    directories = [
+      'current/public',
+      'current/tmp',
+      'current/log',
+      'shared/log',
+    ].map {|dir| "#{deploy_to}/#{dir}"}
+
+    # make sure production.log is created before so that it gets the correct permissions
+    run "touch #{deploy_to}/shared/log/production.log"
+    run "chown -R www-data:www-data #{directories.join(' ')}"
   end
 
   "Update the currently released version of the software directly via an SCM update operation"
@@ -93,7 +116,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   desc "after code update"
   task :after_update, :roles => :app do
     app_update_symlinks
-    db_update_config
+    db::update_config
     apache2_setup
     migrate
     clear_zafu
@@ -102,7 +125,7 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   desc "update symlink to 'sites' directory"
   task :app_update_symlinks, :roles => :app do
-    run "test ! -e #{deploy_to}/current/sites || rm #{deploy_to}/current/sites"
+    run "test ! -e #{deploy_to}/current/sites || rm -rf #{deploy_to}/current/sites || true"
     run "ln -sf #{sites_root} #{deploy_to}/current/sites"
     set_permissions
   end
@@ -114,10 +137,11 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   desc "initial app setup"
   task :app_setup, :roles => :app do
-    gem_update
-    run "test -e #{deploy_to}  || mkdir #{deploy_to}"
-    run "test -e #{sites_root} || mkdir #{sites_root}"
-    deploy::setup
+    paths = ancestry(deploy_to) + ancestry(sites_root) + ancestry("#{deploy_to}/shared/log") + ancestry(dump_root)
+
+    paths.uniq.sort.each do |dir|
+      run "test -e #{dir} || mkdir #{dir}"
+    end
   end
 
   #========================== MANAGE HOST   =========================#
@@ -133,7 +157,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   desc "update code in the current version"
   task :up, :roles => :app do
     run "cd #{deploy_to}/current && #{self[:scm] == 'git' ? "git pull origin #{self[:branch] || 'master'}" : 'svn up'} && (echo #{strategy.configuration[:real_revision]} > #{deploy_to}/current/REVISION)"
-    db_update_config
+    db::update_config
     clear_zafu
     clear_cache
     migrate
@@ -173,9 +197,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       run "test -e /etc/apache2/sites-enabled/#{self[:host]} || a2ensite #{self[:host]}" if debian_host
 
       unless self[:host] =~ /^www/
-        vhost_www = render("#{templates}/vhost_www.rhtml",
-                      :host        => self[:host]
-                      )
+        vhost_www = render("#{templates}/vhost_www.rhtml", :config => self)
         put(vhost_www, "#{vhost_root}/www.#{self[:host]}")
         run "test -e /etc/apache2/sites-enabled/www.#{self[:host]} || a2ensite www.#{self[:host]}" if debian_host
       end
@@ -193,13 +215,13 @@ Capistrano::Configuration.instance(:must_exist).load do
         puts "host or password not set (use -s host=... -s pass=...)"
       else
         # create awstats config file
-        awstats_conf = render("#{templates}/awstats.conf.rhtml", :host => self[:host] )
+        awstats_conf = render("#{templates}/awstats.conf.rhtml", :config => self)
         put(awstats_conf, "/etc/awstats/awstats.#{self[:host]}.conf")
         run "chown www-data:www-data /etc/awstats/awstats.#{self[:host]}.conf"
         run "chmod 640 /etc/awstats/awstats.#{self[:host]}.conf"
 
         # create stats vhost
-        stats_vhost = render("#{templates}/stats.vhost.rhtml", :host => self[:host] )
+        stats_vhost = render("#{templates}/stats.vhost.rhtml", :config => self)
         put(stats_vhost, "#{vhost_root}/stats.#{self[:host]}")
         run "test -e /etc/apache2/sites-enabled/stats.#{self[:host]} || a2ensite stats.#{self[:host]}"
 
@@ -211,7 +233,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         run "cat /etc/cron.d/awstats | grep \"#{self[:host]}\" || echo \"0,10,20,30,40,50 * * * * www-data [ -x /usr/lib/cgi-bin/awstats.pl -a -f /etc/awstats/awstats.#{self[:host]}.conf -a -r #{sites_root}/#{self[:host]}/log/apache2.access.log ] && /usr/lib/cgi-bin/awstats.pl -config=#{self[:host]} -update >/dev/null\n\" >> /etc/cron.d/awstats"
 
         # create .htpasswd file
-        run "test ! -e #{sites_root}/#{self[:host]}/log/.awstatspw || rm #{sites_root}/#{self[:host]}/log/.awstatspw"
+        run "test ! -e #{sites_root}/#{self[:host]}/log/.awstatspw || rm #{sites_root}/#{self[:host]}/log/.awstatspw || true"
         run "htpasswd -c -b #{sites_root}/#{self[:host]}/log/.awstatspw 'admin' '#{self[:pass]}'"
         run "chmod 600 #{sites_root}/#{self[:host]}/log/.awstatspw"
         run "chown www-data:www-data #{sites_root}/#{self[:host]}/log/.awstatspw"
@@ -269,7 +291,9 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   desc "Apache2 initial setup"
   task :apache2_setup, :roles => :web do
-    self[:ports] = (mongrel_port.to_i...(mongrel_port.to_i + mongrel_count.to_i)).to_a
+    if self[:mongrel_port]
+      self[:ports] = (mongrel_port.to_i...(mongrel_port.to_i + mongrel_count.to_i)).to_a
+    end
     httpd_conf = render("#{templates}/httpd.rhtml", :config => self)
     log_rotate = render("#{templates}/logrotate_app.rhtml", :config => self)
     if debian_host
@@ -293,26 +317,25 @@ Capistrano::Configuration.instance(:must_exist).load do
 
   desc "install zena gem on remote server"
   task :gem_update, :roles => :app do
-    run "gem sources -a http://gems.github.com"
     run "gem install zena"
   end
 
   #========================== MYSQL   ===============================#
 
-  desc "set database.yml file according to settings"
-  task :db_update_config, :roles => :app do
-    db_app_config = render("#{templates}/database.rhtml",
-                  :db_name     => db_name,
-                  :db_user     => db_user,
-                  :db_password => db_password
-                  )
-    put(db_app_config, "#{deploy_to}/current/config/database.yml")
-  end
+  namespace :db do
+    desc "set database.yml file according to settings"
+    task :update_config, :roles => :app do
+      db_app_config = render("#{templates}/database.rhtml",
+                    :db_name     => db_name,
+                    :db_user     => db_user,
+                    :db_password => db_password
+                    )
+      put(db_app_config, "#{deploy_to}/current/config/database.yml")
+    end
 
-  desc "create database"
-  task :db_create, :roles => :db do
-    on_rollback do
-      run "mysql -u root -p -e \"DROP DATABASE #{db_name};\"" do |channel, stream, data|
+    desc "create database"
+    task :create, :roles => :db do
+      run "mysql -u root -p -e \"CREATE DATABASE #{db_name} DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci; GRANT ALL ON #{db_name}.* TO '#{db_user}'@'localhost' IDENTIFIED BY '#{db_password}';\"" do |channel, stream, data|
         if data =~ /^Enter password:\s*/m
           logger.info "#{channel[:host]} asked for password"
           channel.send_data "#{password}\n"
@@ -321,121 +344,156 @@ Capistrano::Configuration.instance(:must_exist).load do
       end
     end
 
-    run "mysql -u root -p -e \"CREATE DATABASE #{db_name} DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci; GRANT ALL ON #{db_name}.* TO '#{db_user}'@'localhost' IDENTIFIED BY '#{db_password}';\"" do |channel, stream, data|
-      if data =~ /^Enter password:\s*/m
-        logger.info "#{channel[:host]} asked for password"
-        channel.send_data "#{password}\n"
+    desc "drop database"
+    task :drop, :roles => :db do
+      run "mysql -u root -p -e \"DROP DATABASE #{db_name};\"" do |channel, stream, data|
+        if data =~ /^Enter password:\s*/m
+          logger.info "#{channel[:host]} asked for password"
+          channel.send_data "#{password}\n"
+        end
+        puts data
       end
-      puts data
     end
-  end
 
-  desc "initial database setup"
-  task :db_setup, :roles => :db do
-    transaction do
-      db_create
+    desc "initial database setup"
+    task :setup, :roles => :db do
+      create
     end
-  end
-
 
-  desc "Full initial setup"
-  task :initial_setup do
-    transaction do
-      app_setup
+    desc "Database dump"
+    task :dump, :roles => :db do
+      run "mysqldump #{db_name} -u root -p | /bin/gzip > #{dump_root}/`date +%Y-%m-%d_%H:%M`.sql.gz" do |channel, stream, data|
+        if data =~ /^Enter password:\s*/m
+          logger.info "#{channel[:host]} asked for password"
+          channel.send_data "#{password}\n"
+        end
+        puts data
+      end
+    end
+  end # db
+
+  # Would need to be fixed before being used
+  #
+  # desc "Get backup file back"
+  # task :get_backup, :roles => :app do
+  #   get "#{deploy_to}/current/#{db_name}_data.tgz", "./#{db_name}_#{Time.now.strftime '%Y-%m-%d-%H'}.tgz"
+  # end
+  #
+  # # FIXME: backup not loading data for every site...
+  # desc "Backup all data and bring it backup here"
+  # task :backup, :roles => :app do
+  #   db_dump
+  #   # key track of the current svn revision for app
+  #
+  #   run "#{in_current} svn info > #{deploy_to}/current/zena_version.txt"
+  #   run "#{in_current} rake zena:full_backup RAILS_ENV='production'"
+  #   run "#{in_current} tar czf #{db_name}_data.tgz #{db_name}.sql.tgz sites_data.tgz zena_version.txt"
+  #   get_backup
+  # end
+  case self[:app_type]
+  when :mongrel
+    #========================== MONGREL ===============================#
+    namespace :app do
+
+      desc "configure mongrel"
+      task :configure, :roles => :app do
+        run "#{in_current} mongrel_rails cluster::configure -e production -p #{mongrel_port} -N #{mongrel_count} -c #{deploy_to}/current -P log/mongrel.pid -l log/mongrel.log -a 127.0.0.1 --user www-data --group www-data"
+        run "#{in_current} echo 'config_script: config/mongrel_upload_progress.conf' >> config/mongrel_cluster.yml"
+      end
 
-      db_setup
+      desc "Stop the drb upload_progress server"
+      task :upload_progress_stop , :roles => :app do
+        run "#{in_current} ruby lib/upload_progress_server.rb stop"
+      end
 
-      deploy::update
+      desc "Start the drb upload_progress server"
+      task :upload_progress_start , :roles => :app do
+        run "#{in_current} lib/upload_progress_server.rb start"
+      end
 
-      apache2_setup
+      desc "Restart the upload_progress server"
+      task :upload_progress_restart, :roles => :app do
+        upload_progress_stop
+        upload_progress_start
+      end
 
-      set_permissions
+      desc "Restart mongrels"
+      task :restart, :roles => :app do
+        stop
+        start
+      end
 
-      start
-    end
-  end
+      desc "Start mongrels"
+      task :start, :roles => :app do
+        configure
+        upload_progress_start
+        run "#{in_current} mongrel_rails cluster::start"
+      end
 
-  desc "Database dump"
-  task :db_dump, :roles => :db do
-    run "mysqldump #{db_name} -u root -p > #{deploy_to}/current/#{db_name}.sql" do |channel, stream, data|
-      if data =~ /^Enter password:\s*/m
-        logger.info "#{channel[:host]} asked for password"
-        channel.send_data "#{password}\n"
+      desc "Stop mongrels"
+      task :stop, :roles => :app do
+        configure
+        upload_progress_stop
+        run "#{in_current} mongrel_rails cluster::stop"
+      end
+    end # mongrel
+  when :passenger
+    namespace :upload_progress do
+      desc "Build and install upload progress extension for Apache2"
+      task :setup, :roles => :app do
+        tmp_dir = "/tmp/mod_upload_progress.tmp"
+        c_file = File.read("#{Zena::ROOT}/vendor/apache2_upload_progress/mod_upload_progress.c")
+        run "test -e #{tmp_dir}  || mkdir #{tmp_dir}"
+        put c_file, "#{tmp_dir}/mod_upload_progress.c"
+        run "cd #{tmp_dir} && apxs2 -c -i mod_upload_progress.c && rm -rf #{tmp_dir}"
       end
-      puts data
     end
-    run "#{in_current} tar czf #{db_name}.sql.tgz #{db_name}.sql"
-    run "#{in_current} rm #{db_name}.sql"
-  end
 
-  desc "Get backup file back"
-  task :get_backup, :roles => :app do
-    get "#{deploy_to}/current/#{db_name}_data.tgz", "./#{db_name}_#{Time.now.strftime '%Y-%m-%d-%H'}.tgz"
-  end
+    before "zena:setup", "upload_progress:setup"
 
-  # FIXME: backup not loading data for every site...
-  desc "Backup all data and bring it backup here"
-  task :backup, :roles => :app do
-    db_dump
-    # key track of the current svn revision for app
+    namespace :app do
 
-    run "#{in_current} svn info > #{deploy_to}/current/zena_version.txt"
-    run "#{in_current} rake zena:full_backup RAILS_ENV='production'"
-    run "#{in_current} tar czf #{db_name}_data.tgz #{db_name}.sql.tgz sites_data.tgz zena_version.txt"
-    get_backup
-  end
-
-  Bricks.load_misc('deploy')
+      desc "Restart Passenger app"
+      task :restart, :roles => :app do
+        stop
+        start
+      end
 
+      desc "Start Passenger app"
+      task :start, :roles => :app do
+        run "#{in_current} touch tmp/restart.txt"
+      end
 
-  #========================== MONGREL ===============================#
-  namespace :mongrel do
+      desc "Stop Passenger app (only halt upload DRB)"
+      task :stop, :roles => :app do
+        # Cannot stop
+      end
 
-    desc "configure mongrel"
-    task :configure, :roles => :app do
-      run "#{in_current} mongrel_rails cluster::configure -e production -p #{mongrel_port} -N #{mongrel_count} -c #{deploy_to}/current -P log/mongrel.pid -l log/mongrel.log -a 127.0.0.1 --user www-data --group www-data"
-      run "#{in_current} echo 'config_script: config/mongrel_upload_progress.conf' >> config/mongrel_cluster.yml"
-    end
+      desc "Kill Passenger spawner"
+      task :kill, :roles => :app do
+        run "kill $( passenger-memory-stats | grep 'Passenger spawn server' | awk '{ print $1 }' )"
+      end
+    end # passenger
+  end
 
-    desc "Stop the drb upload_progress server"
-    task :upload_progress_stop , :roles => :app do
-      run "#{in_current} ruby lib/upload_progress_server.rb stop"
-    end
+  #========================== DEPLOY ===============================#
 
-    desc "Start the drb upload_progress server"
-    task :upload_progress_start , :roles => :app do
-      run "#{in_current} lib/upload_progress_server.rb start"
-    end
+  namespace :zena do
+    desc "Prepare server for deployment"
+    task :setup, :roles => :app do
+      transaction do
+        app_setup
 
-    desc "Restart the upload_progress server"
-    task :upload_progress_restart, :roles => :app do
-      upload_progress_stop
-      upload_progress_start
-    end
+        db::setup
 
-    desc "Restart mongrels"
-    task :restart, :roles => :app do
-      stop
-      start
-    end
-
-    desc "Start mongrels"
-    task :start, :roles => :app do
-      configure
-      upload_progress_start
-      run "#{in_current} mongrel_rails cluster::start"
-    end
-
-    desc "Stop mongrels"
-    task :stop, :roles => :app do
-      configure
-      upload_progress_stop
-      run "#{in_current} mongrel_rails cluster::stop"
+        apache2_setup
+      end
     end
   end
 
-  namespace :deploy do
+  before 'deploy:setup', 'zena:setup'
 
+  namespace :deploy do
     desc "Restart application"
     task :restart, :roles => :app do
 
@@ -446,12 +504,8 @@ Capistrano::Configuration.instance(:must_exist).load do
       self[:on_start].each do |block|
         block.call
       end
-      case self[:app_type]
-      when :mongrel
-        mongrel.restart
-      else
-        puts "'#{self[:app_type]}' not supported."
-      end
+
+      app.restart
     end
 
     desc "Start application"
@@ -461,12 +515,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         block.call
       end
 
-      case self[:app_type]
-      when :mongrel
-        mongrel.start
-      else
-        puts "'#{self[:app_type]}' not supported."
-      end
+      app.start
     end
 
     desc "Stop application"
@@ -476,14 +525,8 @@ Capistrano::Configuration.instance(:must_exist).load do
         block.call
       end
 
-      case self[:app_type]
-      when :mongrel
-        mongrel.stop
-      else
-        puts "'#{self[:app_type]}' not supported."
-      end
+      app.stop
     end
 
-  end
-
+  end # mongrel/deploy
 end

data/lib/zena/deploy/awstats.conf.rhtml

@@ -48,7 +48,7 @@
 # If there is several log files from load balancing servers :
 # Example: "/pathtotools/logresolvemerge.pl *.log |"
 #
-LogFile="/var/www/zena/<%= host %>/log/apache2.access.log"
+LogFile="<%= config[:sites_root] %>/<%= config[:host] %>/log/apache2.access.log"
 
 
 # Enter the log file type you want to analyze.
@@ -150,7 +150,7 @@ LogSeparator=" "
 # Example: "ftp.domain.com"
 # Example: "domain.com"
 #
-SiteDomain="<%= host %>"
+SiteDomain="<%= config[:host] %>"
 
 
 # Enter here all other possible domain names, addresses or virtual host
@@ -165,7 +165,7 @@ SiteDomain="<%= host %>"
 # Note: You can also use @/mypath/myfile if list of aliases are in a file.
 # Example: "www.myserver.com localhost 127.0.0.1 REGEX[mydomain\.(net|org)$]"
 #
-HostAliases="localhost 127.0.0.1 <%= host %> stats.<%= host %>"
+HostAliases="localhost 127.0.0.1 <%= config[:host] %> stats.<%= config[:host] %>"
 
 
 # If you want to have hosts reported by name instead of ip address, AWStats
@@ -200,7 +200,7 @@ DNSLookup=2
 # Example: "C:/awstats_data_dir"
 # Default: "."          (means same directory as awstats.pl)
 #
-DirData="/var/www/zena/<%= host %>/log/awstats"
+DirData="<%= config[:sites_root] %>/<%= config[:host] %>/log/awstats"
 
 
 # Relative or absolute web URL of your awstats cgi-bin directory.

data/lib/zena/deploy/httpd.rhtml

@@ -3,7 +3,8 @@
 
 NameVirtualHost *
 <% if config[:app_type] == :passenger  %>
-LoadModule upload_progress_module <%= config[:app_root] %>/vendor/apache2_upload_progress/mod_upload_progress.so
+LoadModule upload_progress_module /usr/lib/apache2/modules/mod_upload_progress.so
+PassengerDefaultUser www-data
 <% elsif config[:app_type] == :mongrel %>
 <Proxy *>
   Order allow,deny
@@ -15,8 +16,11 @@ LoadModule upload_progress_module <%= config[:app_root] %>/vendor/apache2_upload
 <% end %>
 
 <ifmodule mode_expires.c>
-  <filesmatch "\.(jpg|gif|png|css|js)$">
-    ExpiresActive on
-    ExpiresDefault "access plus 1 year"
-  </filesmatch>
+  ExpiresActive on
+  ExpiresDefault A0
+  ExpiresByType image/jpeg "access plus 1 year"
+  ExpiresByType image/gif "access plus 1 year"
+  ExpiresByType image/png "access plus 1 year"
+  ExpiresByType text/css "access plus 1 year"
+  ExpiresByType application/x-javascript "access plus 1 year"
 </ifmodule>

data/lib/zena/deploy/stats.vhost.rhtml

@@ -1,19 +1,19 @@
-# zena awstats vhost for <%= host %>
+# zena awstats vhost for <%= config[:host] %>
 # automatically generated file
 
 <VirtualHost *>
-  ServerName stats.<%= host %>
+  ServerName stats.<%= config[:host] %>
 
   DocumentRoot /usr/share/doc/awstats/examples
-  ErrorLog     /var/www/zena/<%= host %>/log/apache2.error.log
-  CustomLog    /var/www/zena/<%= host %>/log/apache2.access.log combined
+  ErrorLog     <%= config[:sites_root] %>/<%= config[:host] %>/log/apache2.error.log
+  CustomLog    <%= config[:sites_root] %>/<%= config[:host] %>/log/apache2.access.log combined
 
   <location />
-    SetEnv AWSTATS_FORCE_CONFIG <%= host %>
+    SetEnv AWSTATS_FORCE_CONFIG <%= config[:host] %>
 
     AuthType Basic
-    AuthName "<%= host %> stats"
-    AuthUserFile /var/www/zena/<%= host %>/log/.awstatspw
+    AuthName "<%= config[:host] %> stats"
+    AuthUserFile <%= config[:sites_root] %>/<%= config[:host] %>/log/.awstatspw
     Require valid-user
   </location>
 

data/lib/zena/deploy/template.rb

@@ -15,8 +15,12 @@ rakefile("zena_tasks.rake") do
 <<-TASK
 # sync zena tasks to gem version
 env = File.read(File.join(File.dirname(__FILE__), '..', '..', 'config', 'environment.rb'))
-if env =~ /config.gem.*zena.*version.*'(.*?)'/
-  gem 'zena', "= \#{$1}"
+if env =~ /^\\s*(#|).*config.gem.*zena.*version.*'(.*?)'/
+  if $1 == '#'
+    # commented out
+  else
+    gem 'zena', "= \#{$2}"
+  end
 end
 require 'zena'
 require 'tasks/zena'

data/lib/zena/deploy/vhost.rhtml

@@ -63,10 +63,10 @@
   RewriteRule ^([^.]+)$ $1.html [QSA]
 
   # Redirect all non-static requests to cluster
-  RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME}%{QUERY_STRING} !-f
+	RewriteCond %{REQUEST_FILENAME} !-f
   RewriteRule ^/(.*)$ balancer://<%= config[:balancer] %>%{REQUEST_URI} [P,QSA,L]
 <% elsif config[:app_type] == :passenger %>
-  PassengerAppRoot <% config[:app_root] %>
+  PassengerAppRoot <%= config[:app_root] %>
 
   <Location />
     # enable tracking uploads in /

data/lib/zena/deploy/vhost_www.rhtml

@@ -1,10 +1,10 @@
-# zena apache2 vhost for <%= host %>
+# zena apache2 vhost for <%= config[:host] %>
 # automatically generated file
 
 <VirtualHost *>
-  ServerName www.<%= host %>
+  ServerName www.<%= config[:host] %>
 
   RewriteEngine On
-  RewriteCond %{HTTP_HOST} ^www\.<%= host %>$ [NC]
-  RewriteRule ^(.*)$ http://<%= host %>$1 [R=301,L]
+  RewriteCond %{HTTP_HOST} ^www\.<%= config[:host] %>$ [NC]
+  RewriteRule ^(.*)$ http://<%= config[:host] %>$1 [R=301,L]
 </VirtualHost>

data/lib/zena/foxy_parser.rb

@@ -130,11 +130,13 @@ module Zena
       @elements = {}
       @options  = opts
     end
+    
+    def sites
+      @sites ||= Dir["#{Zena::ROOT}/test/sites/*", "#{RAILS_ROOT}/bricks/**/sites/*"].map {|s| File.directory?(s) ? File.basename(s) : nil}.compact.uniq
+    end
 
     def run
-
-      Dir.foreach("#{Zena::ROOT}/test/sites") do |site|
-        next if site =~ /^\./
+      sites.each do |site|
         @site = site
         parse_fixtures
         after_parse
@@ -784,8 +786,7 @@ module Zena
     end
 
     def run
-      Dir.foreach("#{Zena::ROOT}/test/sites") do |site|
-        next if site =~ /^\./ || !File.directory?(File.join("#{Zena::ROOT}/test/sites",site))
+      sites.each do |site|
         out ""
         out "#{site}:"
         out_pair('site_id', Zena::FoxyParser::multi_site_id(site))

data/lib/zena/info.rb

@@ -9,7 +9,7 @@ ZENA_CALENDAR_LANGS = ["en", "fr", "de"] # FIXME: build this dynamically from ex
 ENABLE_XSENDFILE = false
 
 module Zena
-  VERSION = '0.16.8'
+  VERSION = '0.16.9'
   REVISION = 1336
   ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 end

data/zena.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zena}
-  s.version = "0.16.8"
+  s.version = "0.16.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2010-08-30}
+  s.date = %q{2010-09-21}
   s.default_executable = %q{zena}
   s.description = %q{zena is a Ruby on Rails  CMS (content managment system) with a focus on usability, ease of customization and web 2.0 goodness (application like behaviour).}
   s.email = %q{gaspard@teti.ch}
@@ -2020,7 +2020,7 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<ruby-recaptcha>, ["= 1.0.0"])
       s.add_runtime_dependency(%q<tzinfo>, [">= 0.3.12"])
-      s.add_runtime_dependency(%q<rubyless>, [">= 0.3.5"])
+      s.add_runtime_dependency(%q<rubyless>, ["= 0.3.5"])
       s.add_runtime_dependency(%q<rails>, ["= 2.3.4"])
       s.add_runtime_dependency(%q<uuidtools>, ["= 2.0.0"])
       s.add_runtime_dependency(%q<authlogic>, ["= 2.1.3"])
@@ -2039,7 +2039,7 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.0"])
       s.add_dependency(%q<tzinfo>, [">= 0.3.12"])
-      s.add_dependency(%q<rubyless>, [">= 0.3.5"])
+      s.add_dependency(%q<rubyless>, ["= 0.3.5"])
       s.add_dependency(%q<rails>, ["= 2.3.4"])
       s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
       s.add_dependency(%q<authlogic>, ["= 2.1.3"])
@@ -2059,7 +2059,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<ruby-recaptcha>, ["= 1.0.0"])
     s.add_dependency(%q<tzinfo>, [">= 0.3.12"])
-    s.add_dependency(%q<rubyless>, [">= 0.3.5"])
+    s.add_dependency(%q<rubyless>, ["= 0.3.5"])
     s.add_dependency(%q<rails>, ["= 2.3.4"])
     s.add_dependency(%q<uuidtools>, ["= 2.0.0"])
     s.add_dependency(%q<authlogic>, ["= 2.1.3"])

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 16
-  - 8
-  version: 0.16.8
+  - 9
+  version: 0.16.9
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 +02:00
+date: 2010-09-21 00:00:00 +02:00
 default_executable: zena
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,7 @@ dependencies:
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 0