bonethug 0.0.54.14 → 0.0.54.15

Sign up to get free protection for your applications and to get access to all the features.
data/config/deploy.rb CHANGED
@@ -54,13 +54,14 @@ resources += ['backups']
54
54
  log_dirs.push 'log' unless log_dirs.include? 'log'
55
55
 
56
56
  # other vendor dirs
57
- vendor.push 'public/vendor' if use_bower
57
+ vendor.push 'public/vendor' if use_bower and !vendor.include? 'public/vendor'
58
58
 
59
59
  # shared paths
60
60
  shared = resources + log_dirs + vendor + ['tmp']
61
61
  shared.push 'composer.phar' if use_composer
62
62
 
63
63
  # shared config
64
+ set :term_mode, :system
64
65
  set :keep_releases, deploy.get('keep') || 2
65
66
  set :deploy_to, deploy.get('base_dir') + '/' + vhost
66
67
  set :repository, deploy.get('repository')
@@ -1,6 +1,6 @@
1
1
 
2
2
  module Bonethug
3
- VERSION = "0.0.54.14"
4
- BUILD_DATE = "2013-10-14 21:01:02 +1300"
3
+ VERSION = "0.0.54.15"
4
+ BUILD_DATE = "2013-10-15 12:58:25 +1300"
5
5
  end
6
6
 
@@ -1,7 +1,8 @@
1
1
  <?php
2
2
 
3
+ // --------------------------------- //
3
4
  // Load stuff / set up environment
4
- // -------------------------------
5
+ // --------------------------------- //
5
6
 
6
7
  global $project, $databaseConfig;
7
8
 
@@ -14,8 +15,9 @@ $project = 'project';
14
15
  SSViewer::set_theme('project');
15
16
 
16
17
 
18
+ // --------------------------------- //
17
19
  // Env Settings
18
- // ---------------------------
20
+ // --------------------------------- //
19
21
 
20
22
  switch(APPLICATION_ENV){
21
23
 
@@ -73,15 +75,19 @@ switch(APPLICATION_ENV){
73
75
 
74
76
  }
75
77
 
78
+
79
+ // --------------------------------- //
76
80
  // Allow override in dev and stage mode for testing asset pipeline
77
- // ---------------------------
81
+ // --------------------------------- //
78
82
 
79
83
  if (!empty($_GET['env']) && (APPLICATION_ENV == 'staging' || APPLICATION_ENV == 'development')) {
80
84
  Director::set_environment_type(SS_LoadConf::translate_env($_GET['env']));
81
85
  }
82
86
 
87
+
88
+ // --------------------------------- //
83
89
  // DB
84
- // ---------------------------
90
+ // --------------------------------- //
85
91
 
86
92
  $databaseConfig = array(
87
93
  "type" => 'MySQLDatabase',
@@ -94,22 +100,16 @@ $databaseConfig = array(
94
100
  Config::inst()->update('MySQLDatabase', 'connection_charset', 'utf8');
95
101
 
96
102
 
103
+ // --------------------------------- //
97
104
  // Mail
98
- // ---------------------------
105
+ // --------------------------------- //
99
106
 
100
- define('SMTPMAILER_DEFAULT_FROM_NAME', $ss_cnf->mail->default_from['name']);
101
- define('SMTPMAILER_DEFAULT_FROM_EMAIL', $ss_cnf->mail->default_from['email']);
102
- define('SMTPMAILER_SMTP_SERVER_ADDRESS', $ss_cnf->mail->server);
103
- define('SMTPMAILER_DO_AUTHENTICATE', $ss_cnf->mail->authenticate);
104
- define('SMTPMAILER_USERNAME', $ss_cnf->mail->user);
105
- define('SMTPMAILER_PASSWORD', $ss_cnf->mail->pass);
106
- define('SMTPMAILER_CHARSET_ENCODING', $ss_cnf->mail->charset_encoding);
107
- define('SMTPMAILER_USE_SECURE_CONNECTION', $ss_cnf->mail->secure);
108
- define('SMTPMAILER_SMTP_SERVER_PORT', $ss_cnf->mail->port);
107
+ SmtpMailer::set_conf($ss_cnf->mail);
109
108
 
110
109
 
110
+ // --------------------------------- //
111
111
  // Misc
112
- // ---------------------------
112
+ // --------------------------------- //
113
113
 
114
114
  // Set the site locale
115
115
  i18n::set_locale('en_NZ');
@@ -126,8 +126,9 @@ if (!defined('SS_SITE_DATABASE_NAME')) define('SS_SITE_DATABASE_NAME', $database
126
126
  Config::inst()->update('GDBackend', 'default_quality', 80);
127
127
 
128
128
 
129
+ // --------------------------------- //
129
130
  // Assets
130
- // ---------------------------
131
+ // --------------------------------- //
131
132
 
132
133
  Requirements::set_write_js_to_body(true);
133
134
  Requirements::set_combined_files_enabled(true);
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bonethug
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.54.14
4
+ version: 0.0.54.15
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors: