@@ -4,9 +4,7 @@ require 'fileutils' class Nginx < Thor desc "add_site DIRECTORY [HOSTNAME]", "Add a new site to nginx/sites-available" - def add_site(directory, hostname=nil) - check_for_nginx_env - + def add_site(directory, hostname=nil) if !File.exist?(directory) || !File.directory?(directory) puts "#{directory} does not exist or is not a directory!" exit(0) @@ -31,7 +29,6 @@ class Nginx < Thor desc "en_site HOSTNAME", "Enable HOSTNAME" def en_site(hostname) - check_for_nginx_env site_file = nginx_conf('sites-available', hostname) if File.exists?(site_file) @@ -45,14 +42,12 @@ class Nginx < Thor desc "dis_site HOSTNAME", "Disable HOSTNAME" def dis_site(hostname) - check_for_nginx_env run "rm #{nginx_conf('sites-enabled', hostname)}" rm_host(hostname) end desc "edit_site HOSTNAME", "Edit configuration for HOSTNAME" def edit_site(hostname) - check_for_nginx_env site_file = nginx_conf('sites-available', hostname) if File.exists?(site_file) @@ -62,9 +57,8 @@ class Nginx < Thor end end - desc "sites", "Show all avaialble sites" + desc "sites", "Show all available sites" def sites - check_for_nginx_env enabled_sites = Dir[nginx_conf('sites-enabled/*')].map { |site| File.basename(site) } Dir[nginx_conf('sites-available/*')].map { |site| File.basename(site) }.each do |site| puts "#{enabled_sites.include?(site) ? '*' : ' '} #{File.basename(site)}" @@ -82,19 +76,23 @@ class Nginx < Thor run "sudo perl -pi.bak -e 's/^#{ip.gsub('.', '\.')}\\s+#{host.gsub('.', '\.')}\//;s/^\\n$//' /etc/hosts" end - def check_for_nginx_env - @nginx_dir = ENV['NGINX_HOME'] - if @nginx_dir - FileUtils.mkdir_p(nginx_conf('sites-available')) - FileUtils.mkdir_p(nginx_conf('sites-enabled')) - else - puts "You must define an NGINX_HOME environment variable. Example: NGINX_HOME=/usr/local/nginx" - exit(0) + def nginx_dir + if @nginx_dir.nil? + @nginx_dir = ENV['NGINX_HOME'] + if @nginx_dir + FileUtils.mkdir_p(nginx_conf('sites-available')) + FileUtils.mkdir_p(nginx_conf('sites-enabled')) + else + puts "You must define an NGINX_HOME environment variable. Example: NGINX_HOME=/usr/local/nginx" + exit(0) + end end + + @nginx_dir end - + def nginx_conf(*paths) - File.join(@nginx_dir, 'conf', *paths) + File.join(nginx_dir, 'conf', *paths) end def run(cmd, print=true) nginx.thor 1821e0038908b021d0090853c28dc553ed753522 Clinton R. Nixon crnixon@gmail.com http://github.com/crnixon/thor_tasks/commit/9bb037861431c4dc36eb41cead7deabf42e6e623 9bb037861431c4dc36eb41cead7deabf42e6e623 2009-09-19T08:31:34-07:00 2009-09-19T08:31:34-07:00 refactor 6610b0dce78bda1e67de5ae35db96813575ed65d Clinton R. Nixon crnixon@gmail.com