Changeset 1218

Show
Ignore:
Timestamp:
2008-10-08 13:45:02 (3 months ago)
Author:
gaspard
Message:

commit 350006f776058b2354ad7424235de5999ed92f8b
Author: Gaspard Bucher <gaspard@teti.ch>

Fixed 'deploy' for initial runs (clear_zafu broke). Added RedCloth? and recaptcha (not standard gems/versions) into vendor.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/README

    r1160 r1218  
    104104Does not work with gettext > 1.90.0 or RedCloth > 3.x 
    105105    # gem install gettext --version 1.90.0 --no-ri --no-rdoc 
    106     # gem install RedCloth --version 3.0.4 --no-ri --no-rdoc 
    107106Install other gems (you can remove "--no-ri --no-rdoc" if you want the documentation) 
    108     # gem install rake mongrel mongrel_cluster rmagick tzinfo RedCloth syntax mongrel_upload_progress uuidtools daemons ruby-debug --no-ri --no-rdoc 
     107    # gem install rake hoe mongrel mongrel_cluster rmagick tzinfo syntax mongrel_upload_progress uuidtools daemons capistrano ruby-debug --no-ri --no-rdoc 
    109108From source 
    110     # gem install --source http://www.loonsoft.com/recaptcha/pkg/ recaptcha 
    111109 
    112110=== Advised tools 

  • trunk/config/deploy.rb

    r1153 r1218  
    1818 
    1919If anything goes wrong, ask the mailing list (lists.zenadmin.org) or read the content of this file to understand what went wrong... 
     20 
     21And yes, 'pass' is not as intuitive as 'password' but we cannot use the latter because it's used for the ssh login. 
    2022 
    2123 
    …… 
    7577end 
    7678 
    77 "Set svn revision number into Version.rb" 
    78 task :set_revision, :roles => :app do 
    79   run "#{in_current} ./script/set_revision" 
    80 end 
    81  
    8279desc "clear all zafu compiled templates" 
    8380task :clear_zafu, :roles => :app do 
    …… 
    9491  app_update_symlinks 
    9592  db_update_config 
    96   set_revision 
     93  migrate 
    9794  clear_zafu 
    9895  clear_cache 
    99   migrate 
    10096end 
    10197 
    …… 
    131127task :up, :roles => :app do 
    132128  run "cd #{deploy_to}/current && svn up" 
    133   set_revision 
    134129  db_update_config 
    135130  clear_zafu 
    …… 
    271266  run "test -e /etc/apache2/sites-enabled/000-default && a2dissite default || echo 'default already disabled'" 
    272267  run "test -e /etc/apache2/mods-enabled/rewrite.load || a2enmod rewrite" 
     268  run "test -e /etc/apache2/mods-enabled/deflate.load || a2enmod deflate" 
    273269  run "test -e /etc/apache2/mods-enabled/proxy_balancer.load || a2enmod proxy_balancer" 
    274270  run "test -e /etc/apache2/mods-enabled/proxy.load || a2enmod proxy" 
    …… 
    325321    db_setup 
    326322     
    327     deploy::update_code 
     323    deploy::update 
    328324     
    329325    mongrel_setup 

  • trunk/config/version.rb

    r1214 r1218  
    44    MINOR = 10 
    55    TINY  = 0 
    6     REV   = 1214 
     6    REV   = File.exist?(File.join(RAILS_ROOT, 'REVISION')) ? File.read(File.join(RAILS_ROOT, 'REVISION'))[0..5] : '1217+' 
    77    STRING = [MAJOR, MINOR, TINY].join('.') 
    88  end 

  • trunk/lib/parser/lib/rules/zena.rb

    r1215 r1218  
    17071707          _("made with zena") 
    17081708        end 
    1709         "<a class='zena' href='http://zenadmin.org' title='zena #{Zena::VERSION::STRING} r#{Zena::VERSION::REV}'>#{text}</a>" 
     1709        "<a class='zena' href='http://zenadmin.org' title='zena <%= Zena::VERSION::STRING %> r<%= Zena::VERSION::REV %>'>#{text}</a>" 
    17101710      end 
    17111711    end