Merge branch 'saas' into saas-embed-player
Conflicts: airtime_mvc/application/configs/ACL.php
This commit is contained in:
commit
220f21ab22
29 changed files with 422 additions and 149 deletions
|
@ -36,6 +36,7 @@ $ccAcl->add(new Zend_Acl_Resource('library'))
|
|||
->add(new Zend_Acl_Resource('rest:media'))
|
||||
->add(new Zend_Acl_Resource('rest:show-image'))
|
||||
->add(new Zend_Acl_Resource('billing'))
|
||||
->add(new Zend_Acl_Resource('thank-you'))
|
||||
->add(new Zend_Acl_Resource('provisioning'))
|
||||
->add(new Zend_Acl_Resource('embeddableplayer'));
|
||||
|
||||
|
@ -70,7 +71,11 @@ $ccAcl->allow('G', 'index')
|
|||
->allow('A', 'user')
|
||||
->allow('A', 'systemstatus')
|
||||
->allow('A', 'preference')
|
||||
<<<<<<< HEAD
|
||||
->allow('A', 'embeddableplayer')
|
||||
=======
|
||||
->allow('S', 'thank-you')
|
||||
>>>>>>> saas
|
||||
->allow('S', 'billing');
|
||||
|
||||
|
||||
|
|
|
@ -44,6 +44,13 @@ class Config {
|
|||
$CC_CONFIG['dev_env'] = 'production';
|
||||
}
|
||||
|
||||
//Backported static_base_dir default value into saas for now.
|
||||
if (array_key_exists('static_base_dir', $values['general'])) {
|
||||
$CC_CONFIG['staticBaseDir'] = $values['general']['static_base_dir'];
|
||||
} else {
|
||||
$CC_CONFIG['staticBaseDir'] = '/';
|
||||
}
|
||||
|
||||
// Parse separate conf file for cloud storage values
|
||||
$cloudStorageConfig = "/etc/airtime-saas/".$CC_CONFIG['dev_env']."/cloud_storage.conf";
|
||||
if (!file_exists($cloudStorageConfig)) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue