Commit 1f39fa4d authored by drumm's avatar drumm Committed by Neil Drumm
Browse files

Merge branch 'local' into dev-services

parents 50f9156e c3813407
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
include_once(dirname(__FILE__) . '/../provision.service.inc'); include_once(dirname(__FILE__) . '/../provision.service.inc');
function db_drush_init($url = null) { function db_drush_init($url = null) {
include_once('mysql/mysql_service.inc'); include_once('mysql/mysql_service.inc');
$command = drush_get_command(); $command = drush_get_command();
...@@ -28,7 +27,8 @@ function db_drush_init($url = null) { ...@@ -28,7 +27,8 @@ function db_drush_init($url = null) {
$user = urldecode($db['user']); $user = urldecode($db['user']);
$pass = urldecode($db['pass']); $pass = urldecode($db['pass']);
$scheme = $db['scheme']; $scheme = $db['scheme'];
} else { }
else {
#TODO - this stuff is all pretty wrong imo. it should not be asked here #TODO - this stuff is all pretty wrong imo. it should not be asked here
drush_print(dt("No database configuration provided, asking for one interactively")); drush_print(dt("No database configuration provided, asking for one interactively"));
$scheme = drush_prompt(dt("Database type"), "mysql"); $scheme = drush_prompt(dt("Database type"), "mysql");
...@@ -62,7 +62,6 @@ function db_drush_init($url = null) { ...@@ -62,7 +62,6 @@ function db_drush_init($url = null) {
} }
provision_service('db', new provisionService_db_mysql($creds)); provision_service('db', new provisionService_db_mysql($creds));
} }
// this is where we generate the db service object. // this is where we generate the db service object.
......
...@@ -3,10 +3,9 @@ ...@@ -3,10 +3,9 @@
include_once(dirname(__FILE__) . '/../provision.service.inc'); include_once(dirname(__FILE__) . '/../provision.service.inc');
function http_drush_init($url = null) { function http_drush_init($url = null) {
$command = drush_get_command(); $command = drush_get_command();
$command = explode(" ", $command['command']); $command = explode(" ", $command['command']);
if (preg_match("/^provision-/", $command[0])) { if (preg_match("/^provision-/", $command[0])) {
_provision_context_init($url); _provision_context_init($url);
include_once('apache/apache_service.inc'); include_once('apache/apache_service.inc');
provision_service('http', new provisionService_http_apache()); provision_service('http', new provisionService_http_apache());
......
...@@ -224,6 +224,7 @@ function _provision_default_web_group() { ...@@ -224,6 +224,7 @@ function _provision_default_web_group() {
'httpd', 'httpd',
'www-data', 'www-data',
'apache', 'apache',
'webservd',
'nogroup', 'nogroup',
'nobody', 'nobody',
$info['name']); $info['name']);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment