Commit 440920a1 authored by Steven Jones's avatar Steven Jones

Merge branch 'refs/heads/dev/1318374-autoloader' into 6.x-2.x

parents 80516dd9 91d92aac
<?php
class Provision_Config_Bind_slave extends provisionConfig_dns_server {
class Provision_Config_Bind_slave extends Provision_Config_Dns_Server {
public $template = 'slave.tpl.php';
function process() {
......
......@@ -40,7 +40,7 @@ class Provision_Service_dns_bind_slave extends Provision_Service_dns {
* Create the zonefile record on the slave server
*
* Contrarily to the parent class implementation, this *only* creates the
* bind config (managed through the provisionConfig_bind_slave class), and no
* bind config (managed through the Provision_Config_Bind_Slave class), and no
* zonefile, because the zonefile should be managed by bind itself through
* regular zone transfers.
*
......
......@@ -3,7 +3,7 @@
/**
* Apache platform level configuration file class
*/
class ProvisionConfig_Apache_Platform extends Provision_Config_Http_Platform {
class Provision_Config_Apache_Platform extends Provision_Config_Http_Platform {
function process() {
parent::process();
$this->data['extra_config'] = "# Extra configuration from modules:\n";
......
......@@ -15,7 +15,7 @@ class Provision_Service_http_apache extends Provision_Service_http_public {
function init_server() {
parent::init_server();
$this->configs['server'][] = 'Provision_Config_Apache_Server';
$this->configs['platform'][] = 'ProvisionConfig_Apache_Platform';
$this->configs['platform'][] = 'Provision_Config_Apache_Platform';
$this->configs['site'][] = 'Provision_Config_Apache_Site';
}
......
......@@ -38,7 +38,7 @@ class Provision_Service_http_apache_ssl extends Provision_Service_http_ssl {
$this->configs['server'][] = 'Provision_Config_Apache_Ssl_Server';
// Just re-use the standard platform config.
$this->configs['platform'][] = 'ProvisionConfig_Apache_Platform';
$this->configs['platform'][] = 'Provision_Config_Apache_Platform';
$this->configs['site'][] = 'Provision_Config_Apache_Ssl_Site';
}
......
......@@ -63,12 +63,12 @@ function drush_hook_provision_apache_server_config($data) {
* To use templating, return an include statement for the template.
*
* @param $data
* Associative array of data from ProvisionConfig_Apache_Platform::data.
* Associative array of data from Provision_Config_Apache_Platform::data.
*
* @return
* Lines to add to the configuration file.
*
* @see ProvisionConfig_Apache_Platform
* @see Provision_Config_Apache_Platform
*/
function drush_hook_provision_apache_dir_config($data) {
}
......
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