Wiki2Go 1.17.5 → 1.22.0

data/lib/Wiki2Go/Install/make_repository.rb

@@ -5,10 +5,16 @@ require 'etc'
 require 'logger'
 require 'tempfile'
 
-require 'rubygems'
-gem 'rscm','~>0.3.0'
-require 'rscm/logging'
-require 'rscm/better'
+begin
+  require 'rubygems'
+  gem 'rscm','~>0.3.1'
+  require 'rscm'
+  #require 'rscm/logging'
+  require 'rscm/better'
+    
+rescue Exception => e
+  puts e
+end
 
 module RSCM
   class Better
@@ -79,7 +85,6 @@ module RSCM
   end
 end
 
-
 module Wiki2Go
   class RepositoryMaker
 
@@ -392,8 +397,8 @@ module Wiki2Go
       config_file = File.join(dir,'config')
       lock_directory = File.join(@dir,'locks') 
       update_file(config_file,{/LockDir=/    => "LockDir=#{lock_directory}\n" , 
-                  /LogHistory=/ => "LogHistory=TMAR\n" ,
-                  /LockServer=/ => "LockServer=none\n" })
+          /LogHistory=/ => "LogHistory=TMAR\n" ,
+          /LockServer=/ => "LockServer=none\n" })
     end
 
     def update_file(name,substitutions)
@@ -448,31 +453,32 @@ module Wiki2Go
 *.pdf -k 'b'
 *.xls -k 'b'
 *.ppt -k 'b'
-END_CVS_WRAPPERS
+*.swf -k 'b'
+      END_CVS_WRAPPERS
     end
 
-  def set_owner(dir,username,groupname)
-    info = Etc.getpwnam(username)
-    if !info.nil? then
-      user_id = info.uid
-      group_id = info.gid
-      if !groupname.nil? then
-        group_id = Etc.getgrnam(groupname).gid
-      end
-      mode = File.stat(dir).mode | 02775
-      File.chmod(mode,dir)
-      File.chown(user_id,group_id,dir)
-      Dir.glob(File.join(dir,'**/*')).each do |file|
-        if file[0] != '.' then
-          mode = File.stat(file).mode | 02775
-          File.chmod(mode,file)
-          File.chown(user_id,group_id,file)
+    def set_owner(dir,username,groupname)
+      info = Etc.getpwnam(username)
+      if !info.nil? then
+        user_id = info.uid
+        group_id = info.gid
+        if !groupname.nil? then
+          group_id = Etc.getgrnam(groupname).gid
+        end
+        mode = File.stat(dir).mode | 02775
+        File.chmod(mode,dir)
+        File.chown(user_id,group_id,dir)
+        Dir.glob(File.join(dir,'**/*')).each do |file|
+          if file[0] != '.' then
+            mode = File.stat(file).mode | 02775
+            File.chmod(mode,file)
+            File.chown(user_id,group_id,file)
+          end
         end
       end
     end
-  end
 
-end
+  end
 
 end
 

data/lib/Wiki2Go/Install/make_site.rb

@@ -5,12 +5,12 @@ require 'fileutils'
 require 'optparse'
 require "uri"
 
-require 'rubygems'
-WIKI2GO_VERSION = '1.17.5'
+WIKI2GO_VERSION = '1.22.0'
 gem "Wiki2Go","~>#{WIKI2GO_VERSION}"
 
 require 'Wiki2Go/Web.rb'
 require 'Wiki2Go/Wiki2Go.rb'
+
 require 'Wiki2Go/PublicWikiConfig'
 require 'Wiki2Go/PrivateWikiConfig'
 require 'Wiki2Go/ReadWriteWikiConfig'
@@ -39,16 +39,45 @@ module Wiki2Go
     attr_accessor  :subsite
 
     def initialize
-      @user         = WebUser.new('www-data',nil)
+      @user         = WebUser.new(nil,nil)
       @server       = 'localhost'
       @port         = '80'
       @default_wiki = ''
       @directory    = Dir.getwd
-      @type         = ''
+      @type         = nil
       @source_dir   = File.expand_path(File.dirname(__FILE__))
       @subsite      = ''
     end
 
+    # Return a Wiki2GoConfig object, if there is a CgiOptions.rb file
+    # Returns nil if no configuration could be read
+    def existing_configuration
+      configfile = File.join(@directory,'site','scripts','CgiOptions.rb')
+      if File.exists?(configfile) then
+        load configfile
+        return CgiOptions.new
+      end
+      return nil
+    end
+    
+    def read_existing_configuration
+      config = existing_configuration
+      unless config.nil? then
+        if @type.nil? then
+          @type = Configuration.type_of(config)
+        end
+
+        if @user.user.nil? then
+          @user.user = config.user if config.respond_to?(:user) 
+        end
+
+        if @user.group.nil? || @user.group.empty? then
+          @user.group = (config.respond_to?(:group) ? config.group : nil)
+        end
+
+      end
+    end
+
     def dotted_port
       if @port.nil? || @port.empty? then
         ':80'
@@ -74,12 +103,20 @@ module Wiki2Go
        @subsite = uri.path
        @port    = uri.port.to_s
      end
-    end
+   end
+
+   private
+   def self.type_of(configuration)
+     return 'public' if configuration.kind_of?(Wiki2Go::PublicWikiConfig)
+     return 'private' if configuration.kind_of?(Wiki2Go::PrivateWikiConfig)
+     return 'readwrite' if configuration.kind_of?(Wiki2Go::ReadWriteWikiConfig)
+     return nil 
+ end
   end
 
   module Install
 
-    def Install.make_site(args)
+    def Install.make_site(args,&block)
       opts = OptionParser.new
 
       configuration = Configuration.new      
@@ -89,7 +126,7 @@ module Wiki2Go
       opts.on("-u",'--user username',String) { |val| configuration.user.user = val }
       opts.on("-g",'--group groupname',String) { |val| configuration.user.group = val }
       opts.on("-w",'--web default_web',String) { |val| configuration.default_wiki = val }
-      opts.on("-t",'--type wiki_type',"(public, private, readwrite)",String) { |val| configuration.type = val }
+      opts.on("-t",'--type wiki_type',"(public, private, readwrite)",String) { |val| configuration.type = val.downcase }
       opts.on("-d",'--directory dir',"default = .",String) { |val| configuration.directory = File.expand_path(val) }
       opts.on_tail("-h", "--help", "Show this message") do
         puts opts
@@ -97,11 +134,14 @@ module Wiki2Go
       end
       opts.parse(args)
 
-      puts "Installing Wiki2Go site in #{ configuration.directory}"
-
-      if configuration.server.empty? or configuration.type.empty? then
+      configuration.read_existing_configuration
+      
+      if configuration.server.empty? or configuration.type.nil? then
+        puts "Server URL must be specified" if configuration.server.empty?
+        puts "Wiki type (public, private, readwrite) must be specified" if configuration.type.nil?
         puts opts
       else
+        yield "Installing Wiki2Go site in #{configuration.directory}" if block_given?
         oldmask = File.umask(02)
         ensure_path_exists(configuration.directory)
         cd(configuration.directory) {
@@ -116,20 +156,20 @@ module Wiki2Go
         }
         set_owner(configuration.directory,configuration.user)
         File.umask(oldmask)
-        puts "Installed."
-        puts "Include '#{configuration.directory}/config/site.conf' in your Apache configuration"
-        puts "  and restart Apache to activate your wiki."
+        yield "Installed." if block_given?
+        yield "Include '#{configuration.directory}/config/site.conf' in your Apache configuration" if block_given?
+        yield "  and restart Apache to activate your wiki." if block_given?
       end
     end
 
-    def Install.update_site(args)
+    def Install.update_site(args,&block)
       opts = OptionParser.new      
 
       configuration = Configuration.new      
       opts.on("-u",'--user username',String) { |val| configuration.user.user = val }
       opts.on("-g",'--group groupname',String) { |val| configuration.user.group = val }
       opts.on("-d",'--directory dir',"default = .",String) { |val| configuration.directory = File.expand_path(val) }
-      opts.on("-t",'--type wiki_type',"(public, private, readwrite)",String) { |val| configuration.type = val }
+      opts.on("-t",'--type wiki_type',"(public, private, readwrite)",String) { |val| configuration.type = val.downcase }
       opts.on_tail("-h", "--help", "Show this message") do
         puts opts
         exit
@@ -137,14 +177,19 @@ module Wiki2Go
 
       opts.parse(args)
 
-      if configuration.type.empty? then
+      configuration.read_existing_configuration
+      
+      if configuration.type.nil? then
+        puts "Wiki type (public, private, readwrite) must be specified" if configuration.type.nil?
         puts opts
       else
+        yield "Updating Wiki2Go site in #{configuration.directory}" if block_given?
+
         oldmask = File.umask(02)
         cd(configuration.directory) {
           case configuration.type
           when 'private' then
-            do_update_private_site( configuration)
+            do_update_private_site(configuration)
           when 'public'
             do_update_public_site(configuration)
           else
@@ -153,17 +198,18 @@ module Wiki2Go
         }
         set_owner(configuration.directory,configuration.user)
         File.umask(oldmask)
+        yield "Updated." if block_given?
       end
     end
 
-    def Install.make_wiki(args)
+    def Install.make_wiki(args,&block)
       opts = OptionParser.new      
 
       configuration = Configuration.new      
 
       opts.on("-u",'--user username',String) { |val| configuration.user.user = val }
       opts.on("-g",'--group groupname',String) { |val| configuration.user.group = val }
-      opts.on("-w",'--web default_web',String) { |val| configuration.default_wiki = val }
+      opts.on("-w",'--web default_wiki',String) { |val| configuration.default_wiki = val }
       opts.on("-d",'--directory dir',"default = .",String) { |val| configuration.directory = File.expand_path(val) }
       opts.on_tail("-h", "--help", "Show this message") do
         puts opts
@@ -171,21 +217,27 @@ module Wiki2Go
       end
       opts.parse(args)
 
-      oldmask = File.umask(02)
-      cd(configuration.directory) {
-        do_make_wiki(configuration)
-      }      
-      set_owner(configuration.directory,configuration.user)
-      File.umask(oldmask)
+      configuration.read_existing_configuration
+
+      if configuration.default_wiki.empty? then
+        puts "The name of the subwiki is required"
+        puts opts
+      else
+        yield "Creating subwiki #{configuration.default_wiki} in #{configuration.directory}" if block_given?
+        oldmask = File.umask(02)
+        cd(configuration.directory) {
+          do_make_wiki(configuration)
+        }      
+        set_owner(configuration.directory,configuration.user)
+        File.umask(oldmask)
+        yield "Created." if block_given?
+      end
     end
 
     private
 
     def Install.do_make_public_site(configuration)
       do_update_public_site(configuration)
-      config_file = make_config( configuration,'PublicWikiConfig')
-
-      install_html(configuration)
 
       do_make_wiki( configuration)
 
@@ -195,9 +247,6 @@ module Wiki2Go
 
     def Install.do_make_readwrite_site( configuration)
       do_update_readwrite_site( configuration)
-      config_file = make_config( configuration,'ReadWriteWikiConfig')
-
-      install_html(configuration)
 
       do_make_wiki( configuration)
 
@@ -208,9 +257,6 @@ module Wiki2Go
     def Install.do_make_private_site(configuration)
 
       do_update_private_site(configuration)
-      config_file = make_config( configuration,'PrivateWikiConfig')
-
-      install_html(configuration)
 
       do_make_wiki( configuration)
 
@@ -220,22 +266,32 @@ module Wiki2Go
 
 
     def Install.do_update_public_site(config)
-      mkdir_p(File.join('site','scripts','secure'),{ :mode => 0775})
+      install_html(config)
+
       install_scripts(config)
+
+      make_config( config,'PublicWikiConfig')
     end    
 
     def Install.do_update_readwrite_site(config)
-      mkdir_p(File.join('site','scripts','secure'),{ :mode => 0775})
+      install_html(config)
+
       install_readwrite_scripts(config)
+
+      make_config( config,'ReadWriteWikiConfig')
+      
     end    
 
     def Install.do_update_private_site(config)
-      mkdir_p(File.join('site','scripts'),{ :mode => 0775})
+      install_html(config)
+      
       install_scripts(config)
-    end    
 
+      make_config( config,'PrivateWikiConfig')
+    end    
 
     def Install.install_scripts(config)
+      mkdir_p(File.join('site','scripts','secure'),{ :mode => 0775})
       source = File.join(config.source_dir,'..','cgi')
       copy_scripts(source,'site/scripts')
       copy_scripts(source,'site/scripts/secure')
@@ -246,9 +302,10 @@ module Wiki2Go
     end
 
     def Install.install_readwrite_scripts(config)
+      mkdir_p(File.join('site','scripts','secure'),{ :mode => 0775})
       source = File.join(config.source_dir,'..','cgi')
       copy_scripts(source,'site/scripts') { |name| 
-        value = (name != 'save.rb' && name != 'edit.rb') 
+        value = (name != 'save.rb' && name != 'edit.rb' && name != 'wikiedit.rb') 
         value
       }
       copy_scripts(source,'site/scripts/secure')
@@ -297,37 +354,39 @@ module Wiki2Go
     end
 
     def Install.set_owner(dir,owner)
-      info = Etc.getpwnam(owner.user)
-      if !info.nil? then
-        user_id = info.uid
-        group_id = info.gid
-        if !owner.group.nil? then
-          group_id = Etc.getgrnam(owner.group).gid
-        end
-        mode = File.stat(dir).mode | 0664
-        File.chmod(mode,dir)
-        File.chown(user_id,group_id,dir)
-        Dir.glob(File.join(dir,'**/*')).each do |file|
-          if file[0] != '.' then
-            if File.extname(file) == '.rb' then
-              mode = File.stat(file).mode | 0764
-            else
-              mode = File.stat(file).mode | 0664
+      if !owner.user.nil? then
+        info = Etc.getpwnam(owner.user)
+        if !info.nil? then
+          user_id = info.uid
+          group_id = info.gid
+          if !owner.group.nil? then
+            group_id = Etc.getgrnam(owner.group).gid
+          end
+          mode = File.stat(dir).mode | 0664
+          File.chmod(mode,dir)
+          File.chown(user_id,group_id,dir)
+          Dir.glob(File.join(dir,'**/*')).each do |file|
+            if file[0] != '.' then
+              if File.extname(file) == '.rb' then
+                mode = File.stat(file).mode | 0764
+              else
+                mode = File.stat(file).mode | 0664
+              end
+              File.chmod(mode,file)
+              File.chown(user_id,group_id,file)
             end
-            File.chmod(mode,file)
-            File.chown(user_id,group_id,file)
           end
         end
       end
     end
-
+    
     def Install.make_config(config,baseconfig)
       template = <<-TEMPLATE_END
 #!/usr/bin/env ruby
 
 # Select which version of Wiki2Go is used. 
 require 'rubygems'
-require_gem "Wiki2Go","~>#{WIKI2GO_VERSION}"
+gem "Wiki2Go","~>#{WIKI2GO_VERSION}"
 require "Wiki2Go/#{baseconfig}"
 
 class CgiOptions < Wiki2Go::#{baseconfig}
@@ -351,6 +410,17 @@ class CgiOptions < Wiki2Go::#{baseconfig}
     # Set your Amazon affiliate ID for ISBN links
     @amazon_affiliate = 'agilesystems-21'
 
+    # The number of pages that appear in the 'Recent Changes' list and in RSS feeds
+    @pages_in_recent_changes = 20 
+    @pages_in_rss = 20
+
+    # Choose either 'edit' (rich edit) or 'wikiedit' (classic wiki editor)
+    # To enable rich editing
+    #  1. Install the Wiki2GoEditor gem to enable the rich editor
+    #  2. Execute Wiki2Go_install_editor.rb -d <the directory where the wiki is installed> to add the rich editor
+    #  3. Change this setting to 'edit'
+    @editor       = 'wikiedit'
+
     # Set to true if you want to allow the execution of Ruby code inside pages
     # SECURITY WARNING: this code can do absolutely anything, only allow for trusted users
     @allow_dynamic_pages = false
@@ -369,33 +439,45 @@ class CgiOptions < Wiki2Go::#{baseconfig}
     # If you want to enable CVS commit/update support for your wiki, uncomment the following line
     #  and fill in the CVSROOT and the name of the module as parameters
     # The CVS repository and module must exist and the webserver user must have commit access to it
-    # You need to have the rscm 0.3 gem installed  
+    # You need to have the rscm 0.3.x gem installed  
     # use_repository('MYCVSROOT','mymodule')
 
+    # The wiki calculates checksums for pages submitted and stored. This can be used for 2 purposes
+    # - Check that the save was not performed by a robot: the checksum from the edit page is missing
+    # - Check for edit collisions: the checksum submitted is not the same as the checksum of the file on disk
+    # For compatibility reasons, this functionality is disabled by default
+
+    # Set to true to enable checksum checking when saving files
+    @checksum_required = false
+    # Set to a unique string to make your checksums unique
+    @checksum_salt = '#{config.directory}'
+    # Set to true to add users who save without checksum to the blacklist
+    @blacklist_when_no_checksum = false
   end  
 
 end
 TEMPLATE_END
 
       dest = File.join(config.directory,'site','scripts','CgiOptions.rb')
-      if !File.exists?(dest) then
-        File.open(dest,File::CREAT|File::TRUNC|File::RDWR,0664) do |f|
-          f.puts template
-        end
+      if File.exists?(dest) then
+        dest += '.new'
       end
-
+      File.open(dest,File::CREAT|File::TRUNC|File::RDWR,0664) do |f|
+        f.puts template
+      end
+      
       logdir = File.join(config.directory,'logs')
       mkdir_p(logdir,{ :mode => 0775}) unless File.exists?(logdir)
-
+      
       logfile = File.join(logdir,'wiki.log')
       if !File.exists?(logfile) then
         touch logfile
       end
-
+      
       securedir = File.join(config.directory,'site','scripts','secure')
       if File.exists?(securedir) then
         secure = File.join(securedir,'CgiOptions.rb')
-
+        
         begin
           ln_sf(dest,secure)
         rescue NotImplementedError
@@ -404,15 +486,14 @@ TEMPLATE_END
       end
       return dest
     end
-
+    
     def Install.install_html(config)
       dest = File.join(config.directory,'site')
       mkdir_p(File.join(dest,'html'),{ :mode => 0775})
-      source = File.join(config.source_dir,'site','.')
-      cp_r source,dest
-      Dir["#{dest}/**/CVS"].each { |name| rm_r name }
+      source = File.join(config.source_dir,'site')
+      copy_if_not_exists source,dest
     end
-
+    
     def Install.do_make_wiki(config)
       wikiname = config.default_wiki
       textdir = File.join('texts',wikiname)
@@ -421,60 +502,69 @@ TEMPLATE_END
       if !File.exists?(frontpage) then
         touch frontpage
       end
-
+      
       templatedir = File.join('templates',wikiname)
       mkdir_p(templatedir,{ :mode => 0775})
       source = File.join(config.source_dir,'templates')
       dest = templatedir      
       copy_if_not_exists(source,dest)
-
+      
       source = File.join(config.source_dir,'wiki','.')
       wiki_html = File.join('site','html',wikiname)
       mkdir_p(wiki_html,{ :mode => 0775})
       copy_if_not_exists(source,wiki_html)
       
       make_static_homepage(config)
-
+      
     end
-
+    
     def Install.copy_if_not_exists(source,dest)
       Dir.glob(File.join(source,'*')).each do |sourcefile| 
         if FileTest.file?(sourcefile) then
           name = File.basename(sourcefile)
           destfile = File.join(dest,name)
-          if !File.exists?(destfile) then
-            cp sourcefile,destfile
+          cp sourcefile,destfile unless File.exists?(destfile)
+        elsif FileTest.directory?(sourcefile) then
+          name = File.basename(sourcefile)
+          unless name == 'CVS' then
+            destdir = File.join(dest,name)
+            mkdir_p destdir unless File.exists?(destdir)
+            copy_if_not_exists sourcefile,destdir
           end
         end
       end
     end
-
+    
     def Install.write_apache_config(config,contents)
       config_dir = File.join(config.directory,'config')
       mkdir_p(config_dir,{ :mode => 0775}) unless File.exists?(config_dir)
-
+      
       configfile = File.join(config_dir,'site.conf')
-      File.open(configfile,File::CREAT|File::TRUNC|File::RDWR,0664) do |f|
-        f.puts contents
+      unless File.exists?(configfile) then
+        File.open(configfile,File::CREAT|File::TRUNC|File::RDWR,0664) do |f|
+          f.puts contents
+        end
       end
-
+      
       source = File.join(config.source_dir,'config')
       copy_if_not_exists(source,config_dir)
     end
-
+    
     def Install.write_lighttpd_config(config,contents)
       config_dir = File.join(config.directory,'config')
       mkdir_p(config_dir,{ :mode => 0775}) unless File.exists?(config_dir)
-
+      
       configfile = File.join(config_dir,'lighttpd.conf')
-      File.open(configfile,File::CREAT|File::TRUNC|File::RDWR,0664) do |f|
-        f.puts contents
+      unless File.exists?(configfile) then
+        File.open(configfile,File::CREAT|File::TRUNC|File::RDWR,0664) do |f|
+          f.puts contents
+        end
       end
-
+      
       source = File.join(config.source_dir,'config')
       copy_if_not_exists(source,config_dir)
     end
-
+    
     def Install.make_public_apache_config(config)
       template = <<-END_TEMPLATE
 <VirtualHost *#{config.dotted_port}>
@@ -482,11 +572,10 @@ ServerName #{config.server}
 DocumentRoot #{config.directory}/site
 RedirectMatch ^/$ http://#{File.join(config.server_url,config.default_wiki,'FrontPage.html')}
 RedirectMatch ^$ http://#{File.join(config.server_url,config.default_wiki,'FrontPage.html')}
-ScriptAlias /scripts/secure #{config.directory}/site/scripts/secure
 ScriptAlias /scripts #{config.directory}/site/scripts
 <Directory "#{config.directory}/site/scripts/secure">
 AuthType Basic
-AuthName "#{config.default_wiki} wiki site"
+AuthName "#{config.server} wiki site"
 AuthUserFile #{config.directory}/config/passwords
 require valid-user
 Options ExecCGI FollowSymLinks
@@ -495,7 +584,7 @@ Options ExecCGI FollowSymLinks
 Options ExecCGI FollowSymLinks
 </Directory>
 ErrorLog #{config.directory}/logs/error.log
-CustomLog #{config.directory}/logs/access.log.log combined
+CustomLog #{config.directory}/logs/access.log combined
 
 </VirtualHost>
 END_TEMPLATE
@@ -503,12 +592,11 @@ END_TEMPLATE
       subsite_template = <<-END_TEMPLATE
 RedirectMatch ^#{config.subsite}/$ http://#{File.join(config.server_url,config.subsite,config.default_wiki,'FrontPage.html')}
 RedirectMatch ^#{config.subsite}$ http://#{File.join(config.server_url,config.subsite,config.default_wiki,'FrontPage.html')}
-ScriptAlias #{config.subsite}/scripts/secure #{config.directory}/site/scripts/secure
 ScriptAlias #{config.subsite}/scripts #{config.directory}/site/scripts
 Alias #{config.subsite} #{config.directory}/site
 <Directory "#{config.directory}/site/scripts/secure">
 AuthType Basic
-AuthName "#{config.default_wiki} wiki site"
+AuthName "#{config.server} wiki site"
 AuthUserFile #{config.directory}/config/passwords
 require valid-user
 Options ExecCGI FollowSymLinks
@@ -517,10 +605,10 @@ Options ExecCGI FollowSymLinks
 Options ExecCGI FollowSymLinks
 </Directory>
 END_TEMPLATE
-      
+
       write_apache_config(config,(config.subsite.empty? ? template : subsite_template))
     end
-
+    
     def Install.make_public_lighttpd_config( config)
       template = <<-END_OF_TEMPLATE
 # Configuration generated by Wiki2Go
@@ -589,11 +677,10 @@ ServerName #{config.server}
 DocumentRoot #{config.directory}/site
 RedirectMatch ^/$ http://#{File.join(config.server_url,config.default_wiki,'FrontPage.html')}
 RedirectMatch ^$ http://#{File.join(config.server_url,config.default_wiki,'FrontPage.html')}
-ScriptAlias /scripts/secure #{config.directory}/site/scripts/secure
 ScriptAlias /scripts #{config.directory}/site/scripts
 <Directory "#{config.directory}/site/scripts/secure">
 AuthType Basic
-AuthName "#{config.default_wiki} wiki site"
+AuthName "#{config.server} wiki site"
 AuthUserFile #{config.directory}/config/passwords
 require valid-user
 Options ExecCGI FollowSymLinks
@@ -602,7 +689,7 @@ Options ExecCGI FollowSymLinks
 Options ExecCGI FollowSymLinks
 </Directory>
 ErrorLog #{config.directory}/logs/error.log
-CustomLog #{config.directory}/logs/access.log.log combined
+CustomLog #{config.directory}/logs/access.log combined
 
 </VirtualHost>
 END_TEMPLATE
@@ -610,12 +697,11 @@ END_TEMPLATE
       subsite_template = <<-END_TEMPLATE
 RedirectMatch ^#{config.subsite}/$ http://#{File.join(config.server_url,config.subsite,config.default_wiki,'FrontPage.html')}
 RedirectMatch ^#{config.subsite}$ http://#{File.join(config.server_url,config.subsite,config.default_wiki,'FrontPage.html')}
-ScriptAlias #{config.subsite}/scripts/secure #{config.directory}/site/scripts/secure
 ScriptAlias #{config.subsite}/scripts #{config.directory}/site/scripts
 Alias #{config.subsite} #{config.directory}/site
 <Directory "#{config.directory}/site/scripts/secure">
 AuthType Basic
-AuthName "#{config.default_wiki} wiki site"
+AuthName "#{config.server} wiki site"
 AuthUserFile #{config.directory}/config/passwords
 require valid-user
 Options ExecCGI FollowSymLinks
@@ -624,10 +710,10 @@ Options ExecCGI FollowSymLinks
 Options ExecCGI FollowSymLinks
 </Directory>
 END_TEMPLATE
-      
+
       write_apache_config(config,(config.subsite.empty? ? template : subsite_template))
     end
-
+    
     def Install.make_readwrite_lighttpd_config( config)
       template = <<-END_OF_TEMPLATE
 # Configuration generated by Wiki2Go
@@ -699,7 +785,7 @@ RedirectMatch ^$ http://#{File.join(config.server_url,config.default_wiki,'Front
 ScriptAlias /scripts #{config.directory}/site/scripts
 <Directory "#{config.directory}/site/">
 AuthType Basic
-AuthName "#{config.default_wiki} wiki site"
+AuthName "#{config.server} wiki site"
 AuthUserFile #{config.directory}/config/passwords
 require valid-user
 Options ExecCGI FollowSymLinks
@@ -708,19 +794,19 @@ Options ExecCGI FollowSymLinks
 Options ExecCGI FollowSymLinks
 </Directory>
 ErrorLog #{config.directory}/logs/error.log
-CustomLog #{config.directory}/logs/access.log.log combined
+CustomLog #{config.directory}/logs/access.log combined
 
 </VirtualHost>
 END_TEMPLATE
 
-    subsite_template = <<-END_TEMPLATE
+      subsite_template = <<-END_TEMPLATE
 RedirectMatch ^#{config.subsite}/$ http://#{File.join(config.server_url,config.subsite,config.default_wiki,'FrontPage.html')}
 RedirectMatch ^#{config.subsite}$ http://#{File.join(config.server_url,config.subsite,config.default_wiki,'FrontPage.html')}
 ScriptAlias #{config.subsite}/scripts #{config.directory}/site/scripts
 Alias #{config.subsite} #{config.directory}/site
 <Directory "#{config.directory}/site/">
 AuthType Basic
-AuthName "#{config.default_wiki} wiki site"
+AuthName "#{config.server} wiki site"
 AuthUserFile #{config.directory}/config/passwords
 require valid-user
 Options ExecCGI FollowSymLinks
@@ -730,10 +816,10 @@ Options ExecCGI FollowSymLinks
 </Directory>
 
 END_TEMPLATE
-      
+
       write_apache_config(config,(config.subsite.empty? ? template : subsite_template))
     end
-
+    
     def Install.make_private_lighttpd_config( config)
       template = <<-END_OF_TEMPLATE
 # Configuration generated by Wiki2Go
@@ -812,7 +898,7 @@ END_OF_TEMPLATE
         wiki.generate_html(web)
       end
     end
-
+    
     private
     
     def Install.ensure_path_exists(path)