At the agency where I work, we are using a development workflow with aegir wherein we build the production platform with a drush makefile, with custom code checked out of a VCS repository (svn/git). In order to do this, we build the platform on the command line with the --working-copy arg to drush_make and import it with provision-save. (as described by Miguel Jacq here: http://lists.aegirproject.org/pipermail/aegir/2011-January/000026.html)

All this works beautifully, except for the use case where the production platform is located on an Aegir satellite server. Because aegir uses drush rsync to copy platforms to the remote server, our repo information is lost where we need it most. Now that drush has a --include-vcs argument to rsync (#1055416: Drush rsync should support a --include-vcs argument), would it be possible to have provision/aegir optionally use it? I'm willing to work on a patch if given guidance on how best to expose the option to the end user/admin.

CommentFileSizeAuthor
#7 provision-code-1168758-7.patch802 byteshelmo
Support from Acquia helps fund testing for Drupal Acquia logo

Comments

anarcat’s picture

anarcat CreditAttribution: anarcat commented

This sounds like a reasonable idea.

helmo’s picture

helmo CreditAttribution: helmo commented

Seems like a good idea especially when using the git_deploy module.

What about a boolean configuration option for the server in hostmaster?

This probably touches three parts of provision:

  1. platform sync to satilite server
  2. site sync to satillite server
  3. fetch back to master (e.g. before a backup)
Steven Jones’s picture

Steven Jones CreditAttribution: Steven Jones commented
Version: 6.x-1.1 » 6.x-2.x-dev
Issue tags: +AUX Project

Tagging.

helmo’s picture

helmo CreditAttribution: helmo commented

Just for reference.... adding this to ~/.drush/drushrc.php on the aegir master server helps.

$options['include-vcs'] = TRUE;
kristofferwiklund’s picture

kristofferwiklund CreditAttribution: kristofferwiklund commented

#4 solve my problem. Thanks

ergonlogic’s picture

ergonlogic
he/him
Primary language English
Location Montréal, Québec 🇨🇦
CreditAttribution: ergonlogic commented
Version: 6.x-2.x-dev » 7.x-3.x-dev
Issue summary: View changes

New features need to be implemented in the 3.x branch, then we can consider back-porting to Aegir 2.x.

helmo’s picture

helmo CreditAttribution: helmo commented
Component: Code » Drush integration
Status: Active » Needs review
FileSize
provision-code-1168758-7.patch802 bytes

My solution from #4 does not seem to work anymore. I guess it changed with how Drush is invoked.

This patch could work together with the following config snippit in e.g. /etc/drush/drushrc.php

$options['global_sync_options'] = array(
  'include-vcs' => TRUE,
);

Maybe with this the provisionacl module can add 'acls' => TRUE, to the mix.

helmo’s picture

helmo CreditAttribution: helmo commented
Status: Needs review » Fixed

Committed the patch from #7 as fccb2810c4d819e5d0f07779be265971e46cdb42

And cherry-picked on 6.x-2.x-backports

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.

  • Commit fccb281 on 7.x-3.x, dev-helmo-3.x by helmo: 
    Issue #1168758 by helmo | acrollet: Optionally add --include-vcs...