deprec 1.9.3 → 2.0.0

data/lib/deprec/recipes/svn.rb

@@ -1,191 +1,171 @@
+# Copyright 2006-2008 by Mike Bailey. All rights reserved.
 require 'fileutils'
 require 'uri'
 
-Capistrano.configuration(:must_exist).load do
-  
-  # By default, all repositories are group writable by the group 'scm'
-  # Originally I have envisaged this value being initialized here as:
-  #
-  #   set :scm_group, lambda {'scm_' + application} 
-  #
-  # however the SVN docs convinced me it's probably overkill.
-  # http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.serverconfig.pathbasedauthz
-  #
-  set :scm_group, 'scm'
-  
-  # The following values define the svn repository to work with.
-  # If any are undefined but :repository is set, we'll extract the 
-  # necessary values from it, otherwise we'll prompt the user.
-  # 
-  # An example of :repository entries are:
-  #
-  #   set :repository, 'svn+ssh://scm.deprecated.org/var/svn/deprec/trunk'
-  #   set :repository, 'file:///tmp/svn/deprec/trunk'
-  #
-  # I've only used svn+ssh but it shouldn't be hard to get the file scheme working.
-  #
-  set (:svn_scheme) do
-    repository ? URI.parse(repository).scheme : 'svn+ssh'
-  end
-  
-  set (:scm_host) do
-    if repository
-      URI.parse(repository).host || 'localhost'
-    elsif ENV['HOSTS']
-      svn_host = ENV['HOSTS']
-    else
-      Capistrano::CLI.prompt('svn host')
-    end
-  end
+# http://svnbook.red-bean.com/en/1.4/svn-book.html#svn.serverconfig.choosing.apache
 
-  # This is the actual path in the svn repos where we'll check our project into
-  set (:repos_path) do
-    repository ? URI.parse(repository).path : Capistrano::CLI.prompt('svn repos path')
-  end
+Capistrano::Configuration.instance(:must_exist).load do 
+  namespace :deprec do 
+    namespace :svn do
+  
+      set :scm_group, 'scm'
+  
+      # Extract svn attributes from :repository URL
+      # 
+      # Two examples of :repository entries are:
+      #
+      #   set :repository, 'svn+ssh://scm.deprecated.org/var/svn/deprec/trunk'
+      #   set :repository, 'file:///tmp/svn/deprec/trunk'
+      #
+      # This has only been tested with svn+ssh but file: should work.
+      #
+      set (:svn_scheme) { URI.parse(repository).scheme }  
+      set (:svn_host)   { URI.parse(repository).host }
+      set (:repos_path) { URI.parse(repository).path }
+      set (:repos_root) { 
+        URI.parse(repository).path.sub(/\/(trunk|tags|branches)$/, '') 
+      }
+  
+      # account name to perform actions on (such as granting access to an account)
+      # this is a hack to allow us to optionally pass a variable to tasks 
+      set (:svn_account) do
+        Capistrano::CLI.ui.ask 'account name'
+      end
+  
+      set(:svn_backup_dir) { File.join(backup_dir, 'svn') }
+  
+      desc "Install Subversion"
+      task :install do
+        install_deps
+        # XXX should really check if apache has already been installed
+        # XXX can do that when we move to rake
+        # deprec2.download_src(src_package, src_dir)
+        # deprec2.install_from_src(src_package, src_dir)
+      end
+  
+      desc "install dependencies for Subversion"
+      task :install_deps do
+        apt.install( {:base => %w(subversion)}, :stable )
+        # XXX deprec1 - was building from source to get subversion-1.4.5 onto dapper. Compiled swig bindings for trac
+        # apt.install( {:base => %w(build-essential wget libneon25 libneon25-dev swig python-dev libexpat1-dev)}, :stable )
+      end
+  
+      desc "grant a user access to svn repos"
+      task :grant_user_access, :roles => :scm do
+        # creates account, scm_group and adds account to group
+        deprec2.useradd(svn_account)
+        deprec2.groupadd(scm_group) 
+        deprec2.add_user_to_group(svn_account, scm_group)
+      end
+  
+      desc "Create subversion repository and import project into it"
+      task :setup, :roles => :scm do 
+        create_repos
+        import
+      end
+  
+      desc "Create a subversion repository"
+      task :create_repos, :roles => :scm do
+        set :svn_account, top.user
+        grant_user_access
+        deprec2.mkdir(repos_root, :mode => 02775, :group => scm_group, :via => :sudo)
+        sudo "svnadmin verify #{repos_root} > /dev/null 2>&1 || sudo svnadmin create #{repos_root}"
+        sudo "chmod -R g+w #{repos_root}"
+      end
+  
+      # Adapted from code in Bradley Taylors RailsMachine gem
+      desc "Import project into subversion repository."
+      task :import, :roles => :scm do 
+        new_path = "../#{application}"
+        tags = repository.sub("trunk", "tags")
+        branches = repository.sub("trunk", "branches")
+        puts "Adding branches and tags"
+        system "svn mkdir -m 'Adding tags and branches directories' #{tags} #{branches}"
+        puts "Importing application."
+        system "svn import #{repository} -m 'Import'"
+        cwd = Dir.getwd
+        puts "Moving application to new directory"
+        Dir.chdir '../'
+        system "mv #{cwd} #{cwd}.imported"
+        puts "Checking out application."
+        system "svn co #{repository} #{application}"
+        Dir.chdir application
+        remove_log_and_tmp
+        puts "Your repository is: #{repository}" 
+      end
+  
+      # Lifted from Bradley Taylors RailsMachine gem
+      desc "remove and ignore log files and tmp from subversion"
+      task :remove_log_and_tmp, :roles => :scm  do
+        puts "removing log directory contents from svn"
+        system "svn remove log/*"
+        puts "ignoring log directory"
+        system "svn propset svn:ignore '*.log' log/"
+        system "svn update log/"
+        puts "removing contents of tmp sub-directorys from svn"
+        system "svn remove tmp/cache/*"
+        system "svn remove tmp/pids/*"
+        system "svn remove tmp/sessions/*"
+        system "svn remove tmp/sockets/*"
+        puts "ignoring tmp directory"
+        system "svn propset svn:ignore '*' tmp/cache"
+        system "svn propset svn:ignore '*' tmp/pids"
+        system "svn propset svn:ignore '*' tmp/sessions"
+        system "svn propset svn:ignore '*' tmp/sockets"
+        system "svn update tmp/"
+        puts "committing changes"
+        system "svn commit -m 'Removed and ignored log files and tmp'"
+      end
+  
+      # desc "Cache svn name and password on the server. Useful for http-based repositories."
+      task :cache_credentials do
+        run_with_input "svn list #{repository}"
+      end
+  
+      desc "create backup of trac repository"
+      task :backup, :roles => :scm do
+        # http://svnbook.red-bean.com/nightly/en/svn.reposadmin.maint.html#svn.reposadmin.maint.backup
+        # XXX do we need this? insane!
+        # echo "REPOS_BASE=/var/svn" > ~/.svntoolsrc
+        DATE=`date +%Y%m%d-%a`
+    
+        timestamp = Time.now.strftime("%Y%m%d-%a")
+        deprec2.mkdir(svn_backup_dir, :owner => :root, :group => :deploy, :mode => 0775, :via => :sudo)
+        dest_dir = File.join(svn_backup_dir, "#{application}_#{timestamp}")
+        sudo "svnadmin hotcopy #{repos_root} #{dest_dir}"
+      end
 
-  # We'll calculate this based on the repos_path. It's used when initializing the repository
-  set (:repos_root) do
-    (repository ? URI.parse(repository).path : repos_path).sub(/\/(trunk|tags|branches)$/, '')
-  end
-  
-  # account name to perform actions on
-  # this is a hack to allow us to optionally pass a variable to tasks 
-  set (:svn_account) do
-    Capistrano::CLI.prompt('account name')
-  end
-  
-  # I'd like to be able to construct :repository if it's not explicitly set
-  # However we're grabbing values from it in the lines above so it would get a bit recursive
-  # set :repository, lambda { "#{svn_scheme}://#{scm_host == 'localhost' ? '/' : user+'@'+scm_host}#{repos_path}" }
-  
-  # XXX requires apache to have already been installed...
-  desc "install Subversion version control system"
-  task :svn_install, :roles => :scm do
-    # svn 1.4 server improves on 1.3 and is backwards compatible with 1.3 clients
-    # http://subversion.tigris.org/svn_1.4_releasenotes.html
-    #
-    # We're using FSFS instead of BerkeleyDB. Read why below:
-    # http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.reposadmin.basics.backends
-    #
-    # NOTE: we're bulding the python bindings for trac
-    # ./subversion/bindings/swig/INSTALL
-    #
-    version = 'subversion-1.4.4'
-    set :src_package, {
-      :file => version + '.tar.gz',   
-      :md5sum => '702655defa418bab8f683f6268b4fd30  subversion-1.4.4.tar.gz', 
-      :dir => version,  
-      :url => "http://subversion.tigris.org/downloads/#{version}.tar.gz",
-      :unpack => "tar zxf #{version}.tar.gz;",
-      :configure => %w(
-        ./configure 
-        --prefix=/usr/local
-        --with-apxs=/usr/local/apache2/bin/apxs
-        --with-apr=/usr/local/apache2 
-        --with-apr-util=/usr/local/apache2
-        PYTHON=/usr/bin/python
-        ;
-        ).reject{|arg| arg.match '#'}.join(' ') , # DRY this up
-      :make => 'make;',
-      :install => 'make install;',
-      :post_install => '
-        make swig-py; 
-        make install-swig-py;
-        echo /usr/local/lib/svn-python > /usr/lib/python2.4/site-packages/subversion.pth;
-        '
-    }
-    enable_universe
-    apt.install( {:base => %w(libneon25 libneon25-dev swig python-dev)}, :stable )
-    deprec.download_src(src_package, src_dir)
-    deprec.install_from_src(src_package, src_dir)
-  end
-  
-  desc "grant a user access to svn repos"
-  task :svn_grant_user_access, :roles => :scm do
-    deprec.useradd(svn_account)
-    deprec.groupadd(scm_group) 
-    deprec.add_user_to_group(svn_account, scm_group)
-  end
-  
-  desc "Create subversion repository and import project into it"
-  task :svn_setup, :roles => :scm do 
-    svn_create_repos
-    svn_import
-  end
-  
-  task :scm_setup, :roles => :scm do # deprecated
-    svn_setup
-  end
-  
-  task :svn_import_project, :roles => :scm do # deprecated
-    svn_setup
-  end
-  
-  desc "Create a subversion repository"
-  task :svn_create_repos, :roles => :scm do
-    set :svn_account, user
-    svn_grant_user_access
-    deprec.mkdir(repos_root, :mode => '2775', :group => scm_group)
-    sudo "svnadmin verify #{repos_root} > /dev/null 2>&1 || sudo svnadmin create #{repos_root}"
-    sudo "chmod -R g+w #{repos_root}"
-  end
-  
-  # Adapted from code in Bradley Taylors RailsMachine gem
-  desc "Import project into subversion repository."
-  task :svn_import, :roles => :scm do 
-    new_path = "../#{application}"
-    tags = repository.sub("trunk", "tags")
-    branches = repository.sub("trunk", "branches")
-    puts "Adding branches and tags"
-    system "svn mkdir -m 'Adding tags and branches directories' #{tags} #{branches}"
-    puts "Importing application."
-    system "svn import #{repository} -m 'Import'"
-    cwd = Dir.getwd
-    puts "Moving application to new directory"
-    Dir.chdir '../'
-    system "mv #{cwd} #{cwd}.imported"
-    puts "Checking out application."
-    system "svn co #{repository} #{application}"
-    Dir.chdir application
-    svn_remove_log_and_tmp
-    puts "Your repository is: #{repository}" 
-  end
-  
-  # Lifted from Bradley Taylors RailsMachine gem
-  desc "remove and ignore log files and tmp from subversion"
-  task :svn_remove_log_and_tmp, :roles => :scm  do
-    puts "removing log directory contents from svn"
-    system "svn remove log/*"
-    puts "ignoring log directory"
-    system "svn propset svn:ignore '*.log' log/"
-    system "svn update log/"
-    puts "removing contents of tmp sub-directorys from svn"
-    system "svn remove tmp/cache/*"
-    system "svn remove tmp/pids/*"
-    system "svn remove tmp/sessions/*"
-    system "svn remove tmp/sockets/*"
-    puts "ignoring tmp directory"
-    system "svn propset svn:ignore '*' tmp/cache"
-    system "svn propset svn:ignore '*' tmp/pids"
-    system "svn propset svn:ignore '*' tmp/sessions"
-    system "svn propset svn:ignore '*' tmp/sockets"
-    system "svn update tmp/"
-    puts "committing changes"
-    system "svn commit -m 'Removed and ignored log files and tmp'"
-  end
-  
-  # desc "Cache svn name and password on the server. Useful for http-based repositories."
-  task :svn_cache_credentials do
-    run_with_input "svn list #{repository}"
+      task :restore, :roles => :scm do
+        # prompt user to select from list of locally stored backups
+        # tracd_stop
+        # copy out backup
+      end
+  
+  
+      # XXX TODO
+      # desc "backup repository" 
+      # task :svn_backup_respository, :roles => :scm do
+      #   puts "read http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.reposadmin.maint.backup"
+      # end
+
+      end 
   end
-  
+end
 
-  
-  
-  # XXX TODO
-  # desc "backup repository" 
-  # task :svn_backup_respository, :roles => :scm do
-  #   puts "read http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.reposadmin.maint.backup"
-  # end
+# svnserve setup
+# I've previously used ssh exclusively I've decided svnserve is a reasonable choice for collaboration on open source projects.
+# It's easier to setup than apache/ssl webdav access.
+#
+# sudo useradd svn
+# sudo mkdir -p /var/svn/deprec_svnserve_root
+# sudo ln -sf /var/www/apps/deprec/repos /var/svn/deprec_svnserve_root/deprec
+# sudo chown -R svn /var/svn/deprec_svnserve_root/deprec
 
-end
+#
+# XXX put password file into svn and command to push it
+# 
+# # run svnserve
+# sudo -u svn svnserve --daemon --root /var/svn/deprec_svnserve_root
+# 
+# # check it out now
+# svn co svn://scm.deprecated.org/deprec/trunk deprec

data/lib/deprec/recipes/trac.rb

@@ -1,100 +1,277 @@
-Capistrano.configuration(:must_exist).load do
-    
-  set :trac_password_file, lambda { "#{trac_path}/conf/users.htdigest" }
-  set :trac_pidfile, lambda { "#{deploy_to}/shared/pids/trac.pid" }
+# Copyright 2006-2008 by Mike Bailey. All rights reserved.
+Capistrano::Configuration.instance(:must_exist).load do 
+  namespace :deprec do namespace :trac do
+        
+  # Master tracd process for server
+  set :tracd_cmd, '/usr/bin/tracd'
   set :tracd_port, '9000'
-  set (:trac_path) do
-    deploy_to ? "#{deploy_to}/trac" : Capistrano::CLI.prompt('path to trac config')
-  end
-  set (:trac_account) do
-    Capistrano::CLI.prompt('enter new trac user account name')
-  end  
+  set :tracd_pidfile, '/var/run/tracd.pid'
+  
+  # Settings for this projects trac instance
+  set(:tracd_domain_root) { domain.sub(/.*?\./,'') } # strip subdomain from domain
+  set(:tracd_vhost_domain) { "trac-#{application}.#{tracd_domain_root}" } # nginx will proxy this domain to tracd
+  
+  set(:trac_backup_dir) { "#{backup_dir}/trac" }
+  set(:trac_path) { exists?(:deploy_to) ? "#{deploy_to}/trac" : Capistrano::CLI.ui.ask('path to trac config') }
+  set(:tracd_parent_dir) { "/etc/trac.d" }
+  set(:trac_password_file)  { "#{trac_path}/conf/users.htdigest" }
+  set(:trac_account) { Capistrano::CLI.prompt('enter new trac user account name') }
   set :trac_passwordfile_exists, true # hack - should check on remote system instead
+  set(:trac_header_logo_link) { trac_home_url }
+  # We will symlink each projects trac dir into this dir for tracd to find
+
+  # project
+  set(:trac_domain) { domain.sub(/^.*?\./, 'trac.') }
+  set(:trac_home_url) { "http://#{trac_domain}/" }
+  set(:trac_desc) { application } 
   
+  # Settings only used for generating trac.ini for this project
+  # - notification
+  set :trac_always_notify_owner, false
+  set :trac_always_notify_reporter, false
+  set :trac_always_notify_updater, true
+  set :trac_smtp_always_bcc, ''
+  set :trac_smtp_always_cc, ''
+  set :trac_smtp_default_domain, ''
   set :trac_smtp_enabled, true
+  set :trac_smtp_from, 'trac@localhost'
+  set :trac_smtp_password, ''
+  set :trac_smtp_port, 25
+  set :trac_smtp_replyto, 'trac@localhost'
+  set :trac_smtp_server, 'localhost'
+  set :trac_smtp_subject_prefix, '__default__'
+  set :trac_smtp_user, ''
+  set :trac_use_public_cc, false
+  set :trac_use_short_addr, false
+  set :trac_use_tls, false  
+  # - other
+  set(:trac_base_url) { trac_home_url }
+  
+  desc "Install trac on server"
+  task :install, :roles => :scm do
+    install_deps
+    sudo "easy_install Trac==0.11rc1"
+    create_pid_dir
+    create_parent_dir
+    config_gen_system
+    config_system
+    activate_system
+  end
+  
+  task :install_deps do
+    apt.install( {:base => %w(sqlite3 python-setuptools python-subversion)}, :stable )
+  end
+  
+  # The start script has a couple of config values in it.
+  # We may want to extract them into a config file later
+  # and install this script as part of the :install task.
+  SYSTEM_CONFIG_FILES[:trac] = [
+    {:template => 'tracd-init.erb',
+     :path => '/etc/init.d/tracd',
+     :mode => 0755,
+     :owner => 'root:root'}
+  ]
+  
+  PROJECT_CONFIG_FILES[:trac] = [
+    {:template => 'users.htdigest.erb',
+     :path => "conf/users.htdigest",
+     :mode => 0644,
+     :owner => 'root:root'},
+     
+    {:template => 'trac.ini.erb',
+     :path => "conf/trac.ini",
+     :mode => 0644,
+     :owner => 'root:root'},
+     
+    {:template => 'nginx_vhost.conf.erb',
+     :path => "conf/nginx_vhost.conf",
+     :mode => 0644,
+     :owner => 'root:root'}
+  ]
+  
+  desc "Generate config files for trac"
+  task :config_gen do
+    config_gen_system
+    config_gen_project
+  end
+  
+  task :config_gen_system do
+    SYSTEM_CONFIG_FILES[:trac].each do |file|
+      deprec2.render_template(:trac, file)
+    end
+  end
+  
+  task :config_gen_project do
+    PROJECT_CONFIG_FILES[:trac].each do |file|
+      deprec2.render_template(:trac, file)
+    end
+  end
+  
+  desc "Push trac config files to server"
+  task :config, :roles => :scm do
+    config_system
+    config_project
+    restart
+    top.deprec.nginx.restart
+  end
+  
+  task :config_system, :roles => :scm do
+    deprec2.push_configs(:trac, SYSTEM_CONFIG_FILES[:trac])
+  end
   
-  task :trac_install, :roles => :scm do
-    version = 'trac-0.10.4'
-    set :src_package, {
-      :file => version + '.tar.gz',   
-      :md5sum => '52a3a21ad9faafc3b59cbeb87d5a69d2  trac-0.10.4.tar.gz', 
-      :dir => version,  
-      :url => "http://ftp.edgewall.com/pub/trac/#{version}.tar.gz",
-      :unpack => "tar zxf #{version}.tar.gz;",
-      :install => 'python ./setup.py install --prefix=/usr/local;'
-    }
-    enable_universe
-    apt.install( {:base => %w(python-sqlite sqlite python-clearsilver)}, :stable )
-    deprec.download_src(src_package, src_dir)
-    deprec.install_from_src(src_package, src_dir)
-  end
-  
-  task :trac_create_pid_dir, :roles => :scm do
-    deprec.mkdir(File.dirname(trac_pidfile))
-  end
-  
-  task :trac_setup, :roles => :scm do
-    trac_init
-    trac_config
+  task :config_project, :roles => :scm do
+    deprec2.push_configs(:trac, PROJECT_CONFIG_FILES[:trac])
+    symlink_nginx_vhost
+  end
+
+  desc "Initialize the trac db for this project"
+  task :setup, :roles => :scm do
+    init
+    config_gen_project
+    config_project
+    activate_project
+    # set_default_permissions  # XXX re-enable this
     # create trac account for current user 
     set :trac_account, user
     set :trac_passwordfile_exists, false # hack - should check on remote system instead
-    trac_user_add
-    
-    trac_create_pid_dir
+    # user_add # XXX re-enable
   end
   
-  task :trac_init, :roles => :scm do
-    sudo "trac-admin #{trac_path} initenv #{application} sqlite:db/trac.db svn #{repos_root} /usr/local/share/trac/templates"
-    trac_set_default_permissions 
+  task :init, :roles => :scm do
+    deprec2.mkdir(trac_path, :via => :sudo)
+    sudo "trac-admin #{trac_path} initenv #{application} sqlite:db/trac.db svn #{repos_root}"
   end
   
-  task :trac_set_default_permissions, :roles => :scm do
-    trac_anonymous_disable
-    trac_authenticated_enable
+  task :set_default_permissions, :roles => :scm do
+    anonymous_disable
+    authenticated_enable
   end
   
-  # desc "disable anonymous access to everything"
-  task :trac_anonymous_disable, :roles => :scm do
-    sudo "trac-admin #{trac_path} permission remove anonymous '*'"
+  task :start, :roles => :scm do
+    sudo "/etc/init.d/tracd start"
+  end
+
+  task :stop, :roles => :scm do
+    sudo "/etc/init.d/tracd stop"
   end
   
-  # desc "enable authenticated users access to everything"
-  task :trac_authenticated_enable, :roles => :scm do
-    sudo "trac-admin #{trac_path} permission add authenticated TRAC_ADMIN"
+  task :restart, :roles => :scm do
+    stop
+    start
+  end
+
+  task :activate, :roles => :scm do
+    activate_system
+    activate_project
   end
   
-  task :trac_config, :roles => :scm do
-    deprec.render_template_to_file('trac.ini.erb', "#{trac_path}/conf/trac.ini")
+  task :activate_system, :roles => :scm do
+    sudo "update-rc.d tracd defaults"
   end
   
-  task :trac_start, :roles => :scm do
-    # XXX enable this for cap2
-    # XXX run "echo point your browser to http://$CAPISTRANO:HOST$:#{tracd_port}/trac"  
-    auth_string = "--auth=*,#{trac_password_file},#{application}"
-    sudo "tracd #{auth_string} --daemonize --single-env --port=#{tracd_port} --pidfile=#{trac_pidfile} #{trac_path}"
+  task :activate_project, :roles => :scm do
+    symlink_project
   end
   
-  task :trac_stop, :roles => :scm do
-    sudo "kill `cat #{trac_pidfile}` >/dev/null 2>&1"
-    sudo "rm -f #{trac_pidfile}"
+  task :deactivate, :roles => :scm do
+    deactivate_system
+    deactivate_project
   end
   
+  task :deactivate_system, :roles => :scm do
+    sudo "update-rc.d -f tracd remove"
+  end
+  
+  task :deactivate_project, :roles => :scm do
+    unlink_project
+    unlink_nginx_vhost
+    restart
+  end
+  
+  desc "Create backup of trac repository"
+  task :backup, :roles => :web do
+    # http://trac.edgewall.org/wiki/TracBackup
+    timestamp = Time.now.utc.strftime("%Y%m%d%H%M%S")
+    dest_dir = File.join(trac_backup_dir, "trac_#{application}_#{timestamp}")
+    sudo "trac-admin #{trac_path} hotcopy #{dest_dir}"
+  end
+  
+  desc "Restore trac repository from backup"
+  task :restore, :roles => :web do
+    # prompt user to select from list of locally stored backups
+    # tracd_stop
+    # copy out backup
+  end
+  
+  #
+  # Service specific tasks for end users
+  #
   desc "create a trac user"
-  task :trac_user_add, :roles => :scm do
+  task :user_add, :roles => :scm do
     create_file = trac_passwordfile_exists ? '' : ' -c '
     htdigest = '/usr/local/apache2/bin/htdigest'
     # XXX check if htdigest file exists and add '-c' option if not
     # sudo "test -f #{trac_path/conf/users.htdigest}
     create_file = trac_passwordfile_exists ? '' : ' -c '
-    sudo_with_input("#{htdigest} #{create_file} #{trac_path}/conf/users.htdigest #{application} #{trac_account}", /password:/) 
+    deprec2.sudo_with_input("#{htdigest} #{create_file} #{trac_path}/conf/users.htdigest #{application} #{trac_account}", /password:/) 
   end
   
   desc "list trac users"
-  task :trac_list_users, :roles => :scm do
+  task :list_users, :roles => :scm do
     sudo "cat #{trac_path}/conf/users.htdigest"
   end
   
-
+  # desc "disable anonymous access to everything"
+  task :anonymous_disable, :roles => :scm do
+    sudo "trac-admin #{trac_path} permission remove anonymous '*'"
+  end
+  
+  # desc "enable authenticated users access to everything"
+  task :authenticated_enable, :roles => :scm do
+    sudo "trac-admin #{trac_path} permission add authenticated TRAC_ADMIN"
+  end
+  
+  #
+  # Helper tasks used by other tasks
+  #
+  
+  # Link the trac repos for this project into the master trac repos dir
+  # We do this so we can use trac for multiple projects on the same server
+  task :symlink_project, :roles => :scm do
+    sudo "ln -sf #{trac_path} #{tracd_parent_dir}/#{application}"
+  end
+  
+  task :unlink_project, :roles => :scm do
+    link = "#{tracd_parent_dir}/#{application}"
+    sudo "test -h #{link} && sudo unlink #{link} || true"
+  end
+  
+  task :symlink_nginx_vhost, :roles => :scm do
+    sudo "ln -sf #{deploy_to}/trac/conf/nginx_vhost.conf #{nginx_vhost_dir}/tracd-#{application}.conf"
+  end
+  
+  task :unlink_nginx_vhost, :roles => :scm do
+    link = "#{nginx_vhost_dir}/tracd-#{application}.conf"
+    sudo "test -h #{link} && unlink #{link} || true"
+  end
+  
+  # task :symlink_apache_vhost, :roles => :scm do
+  #   sudo "ln -sf #{deploy_to}/trac/conf/trac_apache_vhost.conf #{apache_vhost_dir}/#{application}-trac.conf"
+  # end
+  # 
+  # task :unlink_apache_vhost, :roles => :scm do
+  #   link = "#{apache_vhost_dir}/#{application}-trac.conf"
+  #   sudo "test -h #{link} && unlink #{link} || true"
+  # end
+  
+  task :create_pid_dir, :roles => :scm do
+    deprec2.mkdir(File.dirname(tracd_pidfile))
+  end
+  
+  task :create_parent_dir, :roles => :scm do
+    deprec2.mkdir(tracd_parent_dir, :via => :sudo)
+  end
+    
+end end
   
 end