Skip to content

Commit

Permalink
send back correct boolean when grabbing pantheon creds
Browse files Browse the repository at this point in the history
  • Loading branch information
pirog committed Oct 22, 2012
1 parent 0af339e commit 062d7b2
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
4 changes: 1 addition & 3 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@

Changelog
======================
Version 1.0-rc5
- Fixed NUCLEAR drush crush bug

Version 1.0-rc4
- Fixed image cache files not generating
- Fixed NUCLEAR drush crush bug

Version 1.0-rc3
- Improved documentation
Expand Down
2 changes: 1 addition & 1 deletion INSTALL.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ http://www.ubuntu.com/download/server.
Premade Install
===============
If you wish to install our pre made Kalabox you can download that at.
http://files.kalamuna.com/kalabox1rc5.tar.gz
http://files.kalamuna.com/kalabox1rc4.tar.gz

Import your Box
================
Expand Down
13 changes: 8 additions & 5 deletions modules/drush/files/kala.drush.inc
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,10 @@ function kala_drush_help($section) {
function kala_vhost(){
$args = func_get_args();
$pantheon = _kala_get_pantheon($args[0]);

$site = $pantheon['site'];

if ($pantheon !== FALSE) {
if (!file_exists("/etc/nginx/sites-available/" . $site)) {
$site = $pantheon['site'];
if (!file_exists("/etc/nginx/sites-available/" . $site)) {
if (is_dir("/var/www/" . $site)) {
drush_shell_exec("cp /etc/nginx/sites-available/drupaldefault /tmp/" . $site);
$vhost_default_string = kala_get_file("/tmp/" . $site);
Expand Down Expand Up @@ -274,10 +273,11 @@ function kala_data(){

$args = func_get_args();
$pantheon = _kala_get_pantheon($args[0]);
$pantheon['kaladb'] = str_replace("-", "_", $pantheon['site'] . "_kala");

if ($pantheon !== FALSE) {

$pantheon['kaladb'] = str_replace("-", "_", $pantheon['site'] . "_kala");

drush_print_table(drush_key_value_to_array_table($pantheon));
drush_log('pantheon environment and database variables loaded', 'success');

Expand Down Expand Up @@ -318,6 +318,7 @@ function kala_files(){

$args = func_get_args();
$pantheon = _kala_get_pantheon($args[0]);

if ($pantheon !== FALSE) {

drush_print_table(drush_key_value_to_array_table($pantheon));
Expand Down Expand Up @@ -350,6 +351,7 @@ function kala_build(){

$args = func_get_args();
$pantheon = _kala_get_pantheon($args[0]);

if ($pantheon !== FALSE) {

drush_print('preparing to build your pantheon site... this might take awhile');
Expand Down Expand Up @@ -383,9 +385,10 @@ function kala_destroy(){

$args = func_get_args();
$pantheon = _kala_get_pantheon($args[0]);
$pantheon['kaladb'] = str_replace("-", "_", $pantheon['site'] . "_kala");

if ($pantheon !== FALSE) {

$pantheon['kaladb'] = str_replace("-", "_", $pantheon['site'] . "_kala");

drush_print('preparing to crush your pantheon site... this might take awhile');

Expand Down

0 comments on commit 062d7b2

Please sign in to comment.