Overhaul some things to support a basic CORE Office install

rattail_fabric/composer.py

@@ -26,7 +26,7 @@ Fabric lib for Composer (PHP dependency manager)
 
 from __future__ import unicode_literals, absolute_import
 
-from fabric.api import sudo
+from fabric.api import sudo, cd
 from fabric.contrib.files import exists
 
 from rattail_fabric import make_deploy
@@ -45,3 +45,14 @@ def install_composer(user=None):
         sudo('rm install-composer.sh')
         if user:
             sudo('chown {}: composer.phar'.format(user))
+
+
+def install_globally():
+    """
+    Install `composer.phar` in global location
+    """
+    if not exists('/usr/local/bin/composer.phar'):
+        with cd('/usr/local/bin'):
+            deploy('composer/install-composer.sh', 'install-composer.sh')
+            sudo('./install-composer.sh')
+            sudo('rm install-composer.sh')

rattail_fabric/core.py

@@ -112,6 +112,8 @@ def put(local_path, remote_path, owner='root:root', **kwargs):
         kwargs.setdefault('mirror_local_mode', True)
     kwargs['use_sudo'] = True
     fab_put(local_path, remote_path, **kwargs)
+    if ':' not in owner:
+        owner = '{}:'.format(owner)
     sudo("chown {} '{}'".format(owner, remote_path))
 
 

rattail_fabric/corepos.py

@@ -32,34 +32,39 @@ from fabric.api import sudo, cd, env, run
 from fabric.contrib.files import exists
 
 from rattail_fabric import apt, mysql, mkdir
+from rattail_fabric import make_deploy
 
 
-def install_fannie(rootdir, branch='version-2.3', first_time=None, url=None):
+deploy = make_deploy(__file__)
+
+
+def install_fannie(rootdir, user='www-data', branch='version-2.3', first_time=None, url=None):
     """
-    Install the Fannie app to the given location
+    Install the Fannie app to the given location.
+
+    Please note, this assumes composer is already installed and available.
     """
     if first_time is None:
         first_time = not exists(rootdir)
-    mkdir(rootdir)
+    mkdir(rootdir, owner=user)
     with cd(rootdir):
 
         # fannie source
         if not exists('IS4C'):
-            sudo('git clone https://github.com/CORE-POS/IS4C.git')
+            sudo('git clone https://github.com/CORE-POS/IS4C.git', user=user)
             with cd('IS4C'):
-                sudo('git checkout {}'.format(branch))
+                sudo('git checkout {}'.format(branch), user=user)
         with cd('IS4C'):
-            sudo('git pull')
+            sudo('git pull', user=user)
 
-        # composer
+        if user == 'www-data':
-        if not exists('composer.phar'):
+            # TODO: why is this necessary? (but it is, nonetheless)
-            sudo('curl -sS https://getcomposer.org/installer | php')
+            mkdir('/var/www/.composer', owner=user)
-        mkdir('/var/www/.composer', owner='www-data')
 
         # fannie dependencies
         with cd('IS4C'):
-            mkdir(['vendor', 'fannie/src/javascript/composer-components'], owner='www-data')
+            mkdir(['vendor', 'fannie/src/javascript/composer-components'], owner=user)
-            sudo('../composer.phar install', user='www-data')
+            sudo('composer.phar install', user=user)
 
         # shadowread
         with cd('IS4C/fannie/auth/shadowread'):
@@ -69,15 +74,12 @@ def install_fannie(rootdir, branch='version-2.3', first_time=None, url=None):
         # fannie config
         with cd('IS4C/fannie'):
             if not exists('config.php'):
-                sudo('cp config.php.dist config.php')
+                deploy('corepos/fannie/config.php.mako', 'config.php', owner=user, mode='0600')
-                sudo('chown root:www-data config.php')
-                sudo('chmod 0660 config.php')
 
         # fannie logging
         with cd('IS4C/fannie/logs'):
             for name in ['fannie', 'debug_fannie', 'queries', 'php-errors', 'dayend']:
-                sudo('touch {}.log'.format(name))
+                sudo('touch {}.log'.format(name), user=user)
-                sudo('chown www-data:www-data {}.log'.format(name))
 
     # fannie databases
     mysql.create_user('is4c', host='%', password='is4c')

rattail_fabric/deploy/corepos/fannie/config.php.mako

@@ -0,0 +1,12 @@
+<?php
+
+$FANNIE_ROOT = '/srv/fannie/IS4C/fannie/';
+$FANNIE_URL = '/fannie/';
+$FANNIE_SERVER = '127.0.0.1';
+$FANNIE_SERVER_DBMS = 'MYSQLI';
+$FANNIE_SERVER_USER = 'is4c';
+$FANNIE_SERVER_PW = 'is4c';
+$FANNIE_OP_DB = 'core_op';
+$FANNIE_TRANS_DB = 'core_trans';
+
+?>

rattail_fabric/mysql.py

@@ -35,15 +35,17 @@ from rattail_fabric import apt, make_deploy
 deploy = make_deploy(__file__)
 
 
-def install(password):
+def install(password=None):
     """
     Install the MySQL database service
     """
-    deploy('mysql/debconf.mako', 'debconf', context={'password': password})
+    if password:
-    sudo('debconf-set-selections debconf')
+        deploy('mysql/debconf.mako', 'debconf', context={'password': password})
-    sudo('rm debconf')
+        sudo('debconf-set-selections debconf')
+        sudo('rm debconf')
     apt.install('mysql-server')
-    deploy('mysql/my.cnf.mako', '/root/.my.cnf', mode='0600', context={'password': password})
+    if password:
+        deploy('mysql/my.cnf.mako', '/root/.my.cnf', mode='0600', context={'password': password})
 
 
 def is_mariadb():