Let caller override default fannie/config.php
also make `deploy.full_path()` honor absolute path when given one
This commit is contained in:
parent
64c69aab3c
commit
d713bbe522
|
@ -239,6 +239,8 @@ class Deployer(object):
|
|||
self.deploy(c, local_path, remote_path, **kwargs)
|
||||
|
||||
def full_path(self, local_path):
|
||||
if local_path.startswith('/'):
|
||||
return local_path
|
||||
return '{}/{}'.format(self.deploy_path, local_path)
|
||||
|
||||
def local_exists(self, local_path):
|
||||
|
|
|
@ -41,7 +41,8 @@ def install_corepos(c, rootdir, rooturl_office, production=True,
|
|||
mysql_name_prefix='',
|
||||
composer='composer.phar',
|
||||
composer_install=True,
|
||||
make_shadowread=False):
|
||||
make_shadowread=False,
|
||||
fannie_config=True):
|
||||
"""
|
||||
Install the CORE software to the given location.
|
||||
|
||||
|
@ -93,9 +94,12 @@ def install_corepos(c, rootdir, rooturl_office, production=True,
|
|||
user='{}@localhost'.format(mysql_username))
|
||||
|
||||
# fannie config
|
||||
if fannie_config:
|
||||
remote_path = '{}/IS4C/fannie/config.php'.format(rootdir)
|
||||
if not exists(c, remote_path):
|
||||
deploy_generic(c, 'corepos/fannie-config.php.mako', remote_path,
|
||||
if fannie_config is True:
|
||||
fannie_config = 'corepos/fannie-config.php.mako'
|
||||
deploy_generic(c, fannie_config, remote_path,
|
||||
use_sudo=True, owner='www-data:{}'.format(user), mode='0640',
|
||||
context={'rootdir': rootdir,
|
||||
'rooturl': rooturl_office,
|
||||
|
|
Loading…
Reference in a new issue