rubber 2.12.2 → 2.13.0

data/templates/mysql_cluster/config/rubber/role/mysql_sql/my.cnf

@@ -3,7 +3,7 @@
   
   # When sql nodes on same hosts as data nodes, then this config needs to be
   # additive - the mysql_data node gets generated first due to generator order
-  self_instance = rubber_instances[rubber_env.host]
+  self_instance = rubber_instance
   if self_instance.role_names.include?('mysql_data')
     @additive = ['# mysql_sql start', '# mysql_sql end']
   end

data/templates/passenger/config/rubber/role/passenger/passenger-apache-vhost.conf

@@ -1,5 +1,10 @@
 <%
+  is_old_ubuntu = %w[10.04 12.04].include?(rubber_instance.os_version)
+
+  # Apache 2.2 requires no extension while Apache 2.4 requires the '.conf' extension.
   @path = "/etc/apache2/sites-available/#{rubber_env.app_name}-passenger"
+  @path << '.conf' unless is_old_ubuntu
+
   @post = "a2enmod rewrite && a2enmod ssl && a2enmod expires && a2enmod xsendfile && a2ensite #{rubber_env.app_name}-passenger"
 
   sidekiq_gem_path = if rubber_instances.for_role('sidekiq').any?
@@ -18,6 +23,13 @@ Listen <%= port %>
 <%- end -%>
   DocumentRoot    <%= Rubber.root + "/public" %>
 
+  <%- unless is_old_ubuntu %>
+  <Directory <%= Rubber.root + "/public" %>>
+    Options FollowSymLinks
+    Require all granted
+  </Directory>
+  <% end %>
+
   ErrorDocument 404 /404.html
   ErrorDocument 500 /500.html
 

data/templates/passenger/config/rubber/rubber-passenger.yml

@@ -1,4 +1,4 @@
-passenger_version: '1:4.0.49-1~`lsb_release -sc`1'
+passenger_version: '1:4.0.50-1~`lsb_release -sc`1'
 passenger_ruby: "#{ruby_path}/bin/ruby"
 passenger_listen_port: 7000
 passenger_listen_ssl_port: 7001

data/templates/passenger_nginx/config/rubber/role/passenger_nginx/nginx.conf

@@ -62,7 +62,7 @@ http
   passenger_group <%= rubber_env.app_user %>;
 
   include /etc/nginx/rubber/passenger_nginx.conf;
-  <% if rubber_instances[rubber_env.host].role_names.include?('web_tools') %> 
+  <% if rubber_instance.role_names.include?('web_tools') %>
     include /etc/nginx/rubber/tools.conf;
   <% end %>
 }

data/templates/percona/config/rubber/deploy-percona.rb

@@ -44,7 +44,7 @@ namespace :rubber do
       
       master_instances = rubber_instances.for_role("percona_master") & rubber_instances.filtered  
       master_instances.each do |ic|
-        task_name = "_bootstrap_percona_master_#{ic.full_name}".to_sym()
+        task_name = "_bootstrap_percona_master_#{ic.full_name}".to_sym
         task task_name, :hosts => ic.full_name do
           env = rubber_cfg.environment.bind("percona_master", ic.name)
           exists = capture("echo $(ls #{env.db_data_dir}/ 2> /dev/null)")
@@ -66,7 +66,7 @@ namespace :rubber do
     
       slave_instances = rubber_instances.for_role("percona_slave") & rubber_instances.filtered  
       slave_instances.each do |ic|
-        task_name = "_bootstrap_percona_slave_#{ic.full_name}".to_sym()
+        task_name = "_bootstrap_percona_slave_#{ic.full_name}".to_sym
         task task_name, :hosts => ic.full_name do
           env = rubber_cfg.environment.bind("percona_slave", ic.name)
           exists = capture("echo $(ls #{env.db_data_dir}/ 2> /dev/null)")

data/templates/percona/config/rubber/role/db/my.cnf

@@ -6,7 +6,7 @@
   @post = "mkdir -p #{log_dir}; chown mysql:adm #{log_dir}; chmod 2750 #{log_dir}"
 %>
 
-# Generated by rubber for host <%= rubber_instances[rubber_env.host].external_ip %>
+# Generated by rubber for host <%= rubber_instance.external_ip %>
 #
 # The MySQL database server configuration file.
 #

data/templates/postgresql/config/rubber/deploy-postgresql.rb

@@ -8,12 +8,8 @@ namespace :rubber do
 
     task :setup_apt_sources do
       rubber.sudo_script 'configure_postgresql_repository', <<-ENDSCRIPT
-        # PostgreSQL 9.1 is the default starting in Ubuntu 11.10.
-        release=`lsb_release -sr`
-        needs_repo=`echo "$release < 11.10" | bc`
-        if [[ $needs_repo == 1 ]]; then
-          add-apt-repository ppa:pitti/postgresql
-        fi
+        echo "deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main" > /etc/apt/sources.list.d/pgdg.list
+        wget --quiet -O - http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | sudo apt-key add -
       ENDSCRIPT
     end
     
@@ -40,7 +36,7 @@ namespace :rubber do
       # been bootstrapped for that role before
       master_instances = rubber_instances.for_role("postgresql_master") & rubber_instances.filtered  
       master_instances.each do |ic|
-        task_name = "_bootstrap_postgresql_master_#{ic.full_name}".to_sym()
+        task_name = "_bootstrap_postgresql_master_#{ic.full_name}".to_sym
         task task_name, :hosts => ic.full_name do
           env = rubber_cfg.environment.bind("postgresql_master", ic.name)
           exists = capture("echo $(ls #{env.postgresql_data_dir}/ 2> /dev/null)")
@@ -68,7 +64,7 @@ namespace :rubber do
 
       slave_instances = rubber_instances.for_role("postgresql_slave") & rubber_instances.filtered
       slave_instances.each do |ic|
-        task_name = "_bootstrap_postgresql_slave_#{ic.full_name}".to_sym()
+        task_name = "_bootstrap_postgresql_slave_#{ic.full_name}".to_sym
         task task_name, :hosts => ic.full_name do
           env = rubber_cfg.environment.bind("postgresql_slave", ic.name)
           exists = capture("echo $(ls #{env.postgresql_data_dir}/ 2> /dev/null)")

data/templates/postgresql/config/rubber/role/postgresql/pg_hba.conf

@@ -100,4 +100,4 @@ host    replication <%= rubber_env.db_replication_user %>   <%= network %>    <%
 host    all         <%= rubber_env.db_user %>               <%= network %>    <%= scheme %>
 <% end %>
 
-host    all         <%= rubber_env.db_user %>               <%= rubber_instances[rubber_env.host].internal_ip %>/32    <%= scheme %>
+host    all         <%= rubber_env.db_user %>               <%= rubber_instance.internal_ip %>/32    <%= scheme %>

data/templates/postgresql/config/rubber/role/postgresql/postgresql.conf

@@ -187,7 +187,7 @@ wal_level = hot_standby			# minimal, archive, or hot_standby
 #archive_timeout = 0		# force a logfile segment switch after this
 				# number of seconds; 0 disables
 
-<%- if rubber_instances[rubber_env.host].role_names.include?('postgresql_master') %>
+<%- if rubber_instance.role_names.include?('postgresql_master') %>
 # - Streaming Replication -
 
 #------------------------------------------------------------------------------

data/templates/redis/config/rubber/role/redis/redis.conf

@@ -197,7 +197,7 @@ dir <%= rubber_env.redis_db_dir %>
 <%-
   redis_master = rubber_instances.for_role('redis_master').first
 
-  if rubber_instances[rubber_env.host].role_names.include?('redis_slave')
+  if rubber_instance.role_names.include?('redis_slave')
 %>
 ################################# REPLICATION #################################
 

data/templates/torquebox/config/rubber/role/app/torquebox-apache-vhost.conf

@@ -1,5 +1,10 @@
 <%
+  is_old_ubuntu = %w[10.04 12.04].include?(rubber_instance.os_version)
+
+  # Apache 2.2 requires no extension while Apache 2.4 requires the '.conf' extension.
   @path = "/etc/apache2/sites-available/#{rubber_env.app_name}-torquebox"
+  @path << '.conf' unless is_old_ubuntu
+
   @post = "a2enmod rewrite && a2enmod ssl && a2enmod expires && a2enmod xsendfile && a2ensite #{rubber_env.app_name}-torquebox"
 
   sidekiq_gem_path = if rubber_instances.for_role('sidekiq').any?
@@ -19,6 +24,13 @@ Listen <%= port %>
 <%- end -%>
   DocumentRoot    <%= Rubber.root + "/public" %>
 
+  <%- unless is_old_ubuntu %>
+  <Directory <%= Rubber.root + "/public" %>>
+    Options FollowSymLinks
+    Require all granted
+  </Directory>
+  <% end %>
+
   ErrorDocument 404 /404.html
   ErrorDocument 500 /500.html
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.12.2
+  version: 2.13.0
 platform: ruby
 authors:
 - Matt Conway
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -378,6 +378,7 @@ files:
 - templates/graphite/config/rubber/deploy-graphite.rb
 - templates/graphite/config/rubber/role/collectd/graphite-collectd.conf
 - templates/graphite/config/rubber/role/graphite_server/carbon.conf
+- templates/graphite/config/rubber/role/graphite_server/graphite-carbon-default.conf
 - templates/graphite/config/rubber/role/graphite_server/graphite_server-upstart.conf
 - templates/graphite/config/rubber/role/graphite_server/monit-graphite_server.conf
 - templates/graphite/config/rubber/role/graphite_server/storage-schemas.conf
@@ -390,6 +391,7 @@ files:
 - templates/graphite/config/rubber/role/graphite_web/monit-graphite_web.conf
 - templates/graphite/config/rubber/role/graphite_web/uwsgi.ini
 - templates/graphite/config/rubber/rubber-graphite.yml
+- templates/graphite/templates.rb
 - templates/graphite/templates.yml
 - templates/graylog/config/rubber/common/graylog-rsyslog.conf
 - templates/graylog/config/rubber/deploy-graylog.rb