bonethug 0.0.54.14 → 0.0.54.15

data/config/deploy.rb

@@ -54,13 +54,14 @@ resources += ['backups']
 log_dirs.push 'log' unless log_dirs.include? 'log'
 
 # other vendor dirs
-vendor.push 'public/vendor' if use_bower
+vendor.push 'public/vendor' if use_bower and !vendor.include? 'public/vendor'
 
 # shared paths
 shared = resources + log_dirs + vendor + ['tmp']
 shared.push 'composer.phar' if use_composer
 
 # shared config
+set :term_mode,     :system
 set :keep_releases, deploy.get('keep') || 2
 set :deploy_to,     deploy.get('base_dir') + '/' + vhost
 set :repository,    deploy.get('repository')

data/lib/bonethug/version.rb

@@ -1,6 +1,6 @@
 
       module Bonethug
-        VERSION = "0.0.54.14"
-        BUILD_DATE = "2013-10-14 21:01:02 +1300"
+        VERSION = "0.0.54.15"
+        BUILD_DATE = "2013-10-15 12:58:25 +1300"
       end
     

data/skel/project_types/silverstripe3/public/project/_config.php

@@ -1,7 +1,8 @@
 <?php
 
+// --------------------------------- //
 // Load stuff / set up environment
-// -------------------------------
+// --------------------------------- //
 
 global $project, $databaseConfig;
 
@@ -14,8 +15,9 @@ $project = 'project';
 SSViewer::set_theme('project');
 
 
+// --------------------------------- //
 // Env Settings
-// ---------------------------
+// --------------------------------- //
 
 switch(APPLICATION_ENV){
 
@@ -73,15 +75,19 @@ switch(APPLICATION_ENV){
 		
 }
 
+
+// --------------------------------- //
 // Allow override in dev and stage mode for testing asset pipeline
-// ---------------------------
+// --------------------------------- //
 
 if (!empty($_GET['env']) && (APPLICATION_ENV == 'staging' || APPLICATION_ENV == 'development')) {
 	Director::set_environment_type(SS_LoadConf::translate_env($_GET['env']));
 }
 
+
+// --------------------------------- //
 // DB
-// ---------------------------
+// --------------------------------- //
 
 $databaseConfig = array(
 	"type" 		=> 'MySQLDatabase',
@@ -94,22 +100,16 @@ $databaseConfig = array(
 Config::inst()->update('MySQLDatabase', 'connection_charset', 'utf8');
 
 
+// --------------------------------- //
 // Mail
-// ---------------------------
+// --------------------------------- //
 
-define('SMTPMAILER_DEFAULT_FROM_NAME', 		$ss_cnf->mail->default_from['name']);
-define('SMTPMAILER_DEFAULT_FROM_EMAIL', 	$ss_cnf->mail->default_from['email']);		
-define('SMTPMAILER_SMTP_SERVER_ADDRESS',	$ss_cnf->mail->server);
-define('SMTPMAILER_DO_AUTHENTICATE', 		$ss_cnf->mail->authenticate);
-define('SMTPMAILER_USERNAME', 				$ss_cnf->mail->user);
-define('SMTPMAILER_PASSWORD', 				$ss_cnf->mail->pass);
-define('SMTPMAILER_CHARSET_ENCODING', 		$ss_cnf->mail->charset_encoding);
-define('SMTPMAILER_USE_SECURE_CONNECTION', 	$ss_cnf->mail->secure);
-define('SMTPMAILER_SMTP_SERVER_PORT', 		$ss_cnf->mail->port);
+SmtpMailer::set_conf($ss_cnf->mail);
 
 
+// --------------------------------- //
 // Misc
-// ---------------------------
+// --------------------------------- //
 
 // Set the site locale
 i18n::set_locale('en_NZ');
@@ -126,8 +126,9 @@ if (!defined('SS_SITE_DATABASE_NAME'))	define('SS_SITE_DATABASE_NAME', $database
 Config::inst()->update('GDBackend', 'default_quality', 80);
 
 
+// --------------------------------- //
 // Assets
-// ---------------------------
+// --------------------------------- //
 
 Requirements::set_write_js_to_body(true);
 Requirements::set_combined_files_enabled(true);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bonethug
 version: !ruby/object:Gem::Version
-  version: 0.0.54.14
+  version: 0.0.54.15
   prerelease: 
 platform: ruby
 authors: