rattail/rattail-fabric2
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Let caller override default fannie/config.php

Browse source 
also make `deploy.full_path()` honor absolute path when given one
This commit is contained in:
Lance Edgar 2023-06-10 18:57:57 -05:00
parent 64c69aab3c
commit d713bbe522
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rattail_fabric2/core.py
View file

@ -239,6 +239,8 @@ class Deployer(object):
self.deploy(c, local_path, remote_path, **kwargs) self.deploy(c, local_path, remote_path, **kwargs)
def full_path(self, local_path): def full_path(self, local_path):
if local_path.startswith('/'):
return local_path
return '{}/{}'.format(self.deploy_path, local_path) return '{}/{}'.format(self.deploy_path, local_path)
def local_exists(self, local_path): def local_exists(self, local_path):

24
rattail_fabric2/corepos.py
View file

@ -41,7 +41,8 @@ def install_corepos(c, rootdir, rooturl_office, production=True,
mysql_name_prefix='', mysql_name_prefix='',
composer='composer.phar', composer='composer.phar',
composer_install=True, composer_install=True,
make_shadowread=False): make_shadowread=False,
fannie_config=True):
""" """
Install the CORE software to the given location. Install the CORE software to the given location.
@ -93,15 +94,18 @@ def install_corepos(c, rootdir, rooturl_office, production=True,
user='{}@localhost'.format(mysql_username)) user='{}@localhost'.format(mysql_username))
# fannie config # fannie config
remote_path = '{}/IS4C/fannie/config.php'.format(rootdir) if fannie_config:
if not exists(c, remote_path): remote_path = '{}/IS4C/fannie/config.php'.format(rootdir)
deploy_generic(c, 'corepos/fannie-config.php.mako', remote_path, if not exists(c, remote_path):
use_sudo=True, owner='www-data:{}'.format(user), mode='0640', if fannie_config is True:
context={'rootdir': rootdir, fannie_config = 'corepos/fannie-config.php.mako'
'rooturl': rooturl_office, deploy_generic(c, fannie_config, remote_path,
'mysql_username': mysql_username, use_sudo=True, owner='www-data:{}'.format(user), mode='0640',
'mysql_password': mysql_password, context={'rootdir': rootdir,
'mysql_name_prefix': mysql_name_prefix}) 'rooturl': rooturl_office,
'mysql_username': mysql_username,
'mysql_password': mysql_password,
'mysql_name_prefix': mysql_name_prefix})
# fannie logging # fannie logging
mkdir(c, f'{is4c}/fannie/logs', use_sudo=True, mkdir(c, f'{is4c}/fannie/logs', use_sudo=True,