visfleet-deprec 2.1.4.1 → 2.1.4.2

data/CHANGELOG

@@ -1,7 +1,14 @@
 # deprec changelog
 
-= 2.1.4.1 (Sep 16, 2009)
+= 2.1.4.2 (Oct 22, 2009)
 
+* Apache default site can be removed with the setting apache_single_site,true
+* Postgres user can be priveleged to create db's with setting allow_create_db,true
+which is the current default also.
+
+= 2.1.4.1 (Oct 10, 2009)
+
+* Download ruby using http, which can be squid proxied
 * Now a Visfleet version
 * Added 'maintenance' support
 * More suitable postgress configs

data/lib/deprec/recipes/db/postgresql.rb

@@ -3,6 +3,8 @@
 Capistrano::Configuration.instance(:must_exist).load do 
   namespace :deprec do
     namespace :postgresql do
+
+      set :allow_create_db, true
       
       # Installation
       desc "Install postgresql"
@@ -75,7 +77,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       
       desc "Create a PostgreSQL user"
       task :create_user, :roles => :db do
-        cmd = "su - postgres -c \'createuser -P -D -A -E #{db_user}\'"
+        cmd = "su - postgres -c \'createuser -P #{(allow_create_db) ? "-d" : "-D" } -A -E #{db_user}\'"
         sudo cmd do |channel, stream, data|
           if data =~ /^Enter password for new/
             channel.send_data "#{db_password}\n" 

data/lib/deprec/recipes/web/apache.rb

@@ -4,6 +4,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     namespace :apache do
       
       set :apache_user, 'www-data'
+      set :apache_single_app, false
       set :apache_vhost_dir, '/etc/apache2/sites-available'
       set :apache_ssl_enabled, false
       set :apache_ssl_ip, nil
@@ -16,6 +17,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       task :install do
         install_deps
         enable_modules
+        remove_default_site if apache_single_app
         reload
       end
       
@@ -138,6 +140,10 @@ Capistrano::Configuration.instance(:must_exist).load do
         # not yet implemented
       end
 
+      task :remove_default_site, :roles => :web do
+        sudo "a2dissite default"
+      end
+
     end
   end
 end

data/lib/deprec/templates/apache/status.conf.erb

@@ -5,13 +5,13 @@
 # Uncomment and change the ".example.com" to allow
 # access from other hosts.
 #
-ExtendedStatus On
-<Location /server-status>
-    SetHandler server-status
-    Order deny,allow
-    Deny from all
-    Allow from localhost ip6-localhost
-#    Allow from .example.com
-</Location>
+ExtendedStatus Off
+#<Location /server-status>
+#    SetHandler server-status
+#    Order deny,allow
+#    Deny from all
+#    Allow from localhost ip6-localhost
+##    Allow from .example.com
+#</Location>
 
-</IfModule>
+</IfModule>

data/lib/deprec/templates/passenger/apache_vhost.erb

@@ -1,25 +1,13 @@
 # Don't cause the server to break if Passenger module not loaded
 <IfModule passenger_module>
 	<VirtualHost *:80>
-	  ServerName <%= domain %>
-      <%- 4.times do |counter| -%>
-        ServerAlias <%= domain.sub(/.*?\./, "assets#{counter}.") %>
-      <%- end %>
 	  DocumentRoot "<%= passenger_document_root %>"
 	  CustomLog <%= apache_log_dir %>/<%= application %>-access.log combined
 	  ErrorLog <%= apache_log_dir %>/<%= application %>-error.log
 	  
 	  RailsEnv <%= rails_env %>
 	  RailsAllowModRewrite <%= passenger_rails_allow_mod_rewrite %>
-	  #
-		<% if passenger_use_mod_rewrite_for_disable %>
-	  # Check for maintenance file and redirect all requests
-	  RewriteEngine On
-	  RewriteCond %{REQUEST_URI} !\.(css|jpg|png|gif)$
-	  RewriteCond %{DOCUMENT_ROOT}/system/maintenance.html -f
-	  RewriteCond %{SCRIPT_FILENAME} !maintenance.html
-    RewriteRule ^.*$ /system/maintenance.html [L]
-		<% end %>
+
 	  <Directory "<%= passenger_document_root %>">
 	    Order allow,deny
 	    Allow from all
@@ -27,3 +15,4 @@
 	</VirtualHost>
 </IfModule>
 
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: visfleet-deprec
 version: !ruby/object:Gem::Version 
-  version: 2.1.4.1
+  version: 2.1.4.2
 platform: ruby
 authors: 
 - Mike Bailey
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-14 00:00:00 +13:00
+date: 2009-10-27 00:00:00 +13:00
 default_executable: depify
 dependencies: 
 - !ruby/object:Gem::Dependency