Changeset 1098

Timestamp:

2008-07-15 22:34:49 (6 months ago)

Author:

gaspard

Message:

Created a capistrano task to automatically setup awstats

Files:

• trunk/README (modified) (1 diff)
• trunk/app/helpers/application_helper.rb (modified) (1 diff)
• trunk/app/views/nodes/_edit_attribute.rhtml (modified) (1 diff)
• trunk/app/views/nodes/update.rjs (modified) (1 diff)
• trunk/config/awstats.conf.rhtml (added)
• trunk/config/deploy.rb (modified) (1 diff)
• trunk/config/stats.vhost.rhtml (added)
• trunk/lib/parser/lib/rules/zena.rb (modified) (3 diffs)
• trunk/test/fixtures/files/Node-test.zafu (moved) (moved from trunk/test/fixtures/files/ajax_test.zafu)
• trunk/test/sites/zena/nodes.yml (modified) (3 diffs)
• trunk/test/sites/zena/template_contents.yml (modified) (5 diffs)
• trunk/test/sites/zena/versions.yml (modified) (5 diffs)
• trunk/test/unit/skin_test.rb (modified) (2 diffs)
• trunk/test/unit/template_test.rb (modified) (2 diffs)

trunk/README

@@ -62 +62 @@
-
-=== 1. Original in debian etch
-
+ liburi-perl
-
-If you want to enable LateX (PDF generation)

trunk/app/helpers/application_helper.rb

@@ -52 +52 @@
-          page.replace params[:dom_id], :file => fullpath_from_template_url + ".erb"
-        end
-
+ && params[:action] == 'create'
-          page.toggle "#{params[:dom_id]}_form", "#{params[:dom_id]}_add"
-          page << params[:done]

trunk/app/views/nodes/_edit_attribute.rhtml

@@ -7 +7 @@
-    </div>
-    <div class='wrapper'>
-
+, :id => "#{params[:dom_id]}_"
-      <input type='submit' text='<%= _('validate') %>'/>
-    </div>

trunk/app/views/nodes/update.rjs

@@ -2 +2 @@
-  attribute = params[:node].keys[0]
-  if params[:zazen] == 'true'
-" + link_to_remote(_('edit'), :url => edit_node_path(@node[:zip]) + "?attribute=#{attribute}&dom_id=#{params[:dom_id]}&zazen=true", :method => :get) + "
+#{link_to_remote(_('edit'), :url => edit_node_path(@node[:zip]) + "?attribute=#{attribute}&dom_id=#{params[:dom_id]}#{params[:publish] == 'true' ? '&publish=true' : ''}&zazen=true", :method => :get)}
-  else
-    page.replace_html params[:dom_id], link_to_remote(params[:node][attribute], :url => edit_node_path(@node[:zip]) + "?attribute=#{attribute}&dom_id=#{params[:dom_id]}", :method => :get)

trunk/config/deploy.rb

@@ -207 +207 @@
-end
-
+#========================== APACHE2 ===============================#
+desc "Update awstats configuration file"
+task :create_awstats, :roles => :web do
+  unless self[:host] && self[:pass]
+    puts "host or password not set (use -s host=... -s pass=...)"
+  else
+    # create awstats config file
+    awstats_conf = render("config/awstats.conf.rhtml", :host => self[:host] )
+    put(awstats_conf, "/etc/awstats/awstats.#{self[:host]}.conf")
+    
+    # create stats vhost
+    stats_vhost = render("config/stats.vhost.rhtml", :host => self[:host] )
+    put(stats_vhost, "/etc/apache2/sites-available/stats.#{self[:host]}")
+    run "test -e /etc/apache2/sites-enabled/stats.#{self[:host]} || a2ensite stats.#{self[:host]}"
+    
+    # directory setup for stats
+    run "test -e /var/www/zena/#{self[:host]}/log/awstats || mkdir /var/www/zena/#{self[:host]}/log/awstats"
+    run "chown www-data:www-data /var/www/zena/#{self[:host]}/log/awstats"
+    
+    # setup cron task for awstats
+    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 /var/www/zena/#{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 /var/www/zena/#{self[:host]}/log/.awstatspw || rm /var/www/zena/#{self[:host]}/log/.awstatspw"
+    run "htpasswd -c -b /var/www/zena/#{self[:host]}/log/.awstatspw 'admin' '#{self[:pass]}'"
+    
+    # reload apache
+    run "/etc/init.d/apache2 reload"
+  end
+end
+
-desc "Rename a webhost"
-task :rename_host, :roles => :web do

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

@@ -908 +908 @@
-            hidden_fields['udom_id'] = target.erb_dom_id
-          end
-block = ancestor('block'
+(block = ancestor('block')
-          # updates template url
-
+ 
-          hidden_fields['udom_id'] = block.erb_dom_id
-        end
@@ -916 +916 @@
-        hidden_fields['t_url'] = template_url
-        
-
-
-
-
-
-
+
+
+
-        
-        if node_kind_of?(Node)
@@ -950 +947 @@
-          end
-          if params[:done] == 'focus'
-            erb_dom_id = @context[:saved_template] ? '<%= params[:dom_id] %>' : self.erb_dom_id
-            if params[:focus]
-              hidden_fields['done'] = "'$(\"#{erb_dom_id}_#{@params[:focus]}\").focus();'"

trunk/test/sites/zena/nodes.yml

@@ -261 +261 @@
-  parent:          collections
-
-
+_zafu
-  class:           Template
-  name:            Project-changes-xml
-  parent:          wiki_skin
-
-
+_zafu
-  class:           Template
-  name:            Page-changes
-  parent:          wiki_skin
-
-
+_zafu
-  class:           Template
-  name:            Node
@@ -329 +329 @@
-  parent:          default
-
+Node_test_zafu:
+  class:           Template
+  name:            Node-test
+  parent:          default
+
-Project_zafu:
-  class:           Template
@@ -334 +339 @@
-  parent:          default
-
-
+_zafu
-  class:           Template
-  name:            Node-*login

trunk/test/sites/zena/template_contents.yml

@@ -63 +63 @@
-  klass:           Project
-  
-
-
+_zafu
+_zafu
-  skin_name:       wiki_skin
-  format:          html
@@ -71 +71 @@
-  klass:           Node
-
-
-
+_zafu
+_zafu
-  skin_name:       wiki_skin
-  format:          xml
@@ -79 +79 @@
-  klass:           Project
-
-
-
+_zafu
+_zafu
-  skin_name:       wiki_skin
-  format:          html
@@ -87 +87 @@
-  klass:           Page
-  
-
-
+_zafu
+_zafu
-  skin_name:       default
-  format:          html
@@ -94 +94 @@
-  mode:            "*login"
-  klass:           Node
-
+
+
+
+
+
+
+
+

trunk/test/sites/zena/versions.yml

@@ -379 +379 @@
-wiki_project_changes_xml_en:
-  type:            TemplateVersion
-
+_zafu
-  user:            tiger
-  comment:         layout for wiki
@@ -398 +398 @@
-wiki_page_changes_en:
-  type:            TemplateVersion
-
+_zafu
-  user:            tiger
-  comment:         layout for wiki
@@ -421 +421 @@
-wiki_node_en:
-  type:            TemplateVersion
-
+_zafu
-  user:            tiger
-  comment:         master template for wiki
@@ -505 +505 @@
-<% File.foreach("#{RAILS_ROOT}/db/init/base/skins/default/Node-*popupLayout.zafu") do |l| %>    <%= l %><% end %>
-
+Node_test_en:
+  type:            TemplateVersion
+  node:            Node_test_zafu
+  user:            tiger
+  text:  |
+<% File.foreach("#{RAILS_ROOT}/test/fixtures/files/Node-test.zafu") do |l| %>    <%= l %><% end %>
+
-notes_zafu_en:
-  type:            TemplateVersion
@@ -519 +526 @@
-<% File.foreach("#{RAILS_ROOT}/db/init/base/skins/default/Project.zafu") do |l| %>    <%= l %><% end %>
-
-
-
-
+_zafu_en
+
+_zafu
-  user:            tiger
-  text:  |

trunk/test/unit/skin_test.rb

@@ -6 +6 @@
-    login(:lion)
-    skin = secure!(Node) { nodes(:wiki_skin) }
-
+_zafu
-    assert_kind_of Template, tmpt
-    assert_equal 'wiki_skin', skin.name
@@ -12 +12 @@
-    skin.name = 'fun'
-    assert skin.save, "Can save skin."
-
+_zafu
-    assert_equal 'fun', tmpt.c_skin_name
-
+_zafu
-  end
-end

trunk/test/unit/template_test.rb

@@ -245 +245 @@
-  def test_move_bad_parent
-    login(:lion)
-
+_zafu
-    assert !doc.update_attributes(:parent_id => nodes_id(:collections))
-    assert_equal "Invalid parent (section is not a Skin)", doc.errors[:parent_id]
@@ -252 +252 @@
-  def test_move
-    login(:lion)
-
+_zafu
-    tmpt_content = doc.v_content
-    assert_equal 'wiki_skin', tmpt_content.skin_name
-    assert doc.update_attributes(:parent_id => nodes_id(:default))
-    
-
+_zafu
-    tmpt_content = doc.v_content
-    assert_equal 'default', tmpt_content.skin_name