Commit db2b0626 authored by mig5's avatar mig5 Committed by mig5
parents 922c9cec e80530d1
......@@ -3,6 +3,12 @@
Allow from all
<?php print $extra_config; ?>
<IfModule mod_rewrite.c>
RewriteEngine on
# allow files to be accessed without /sites/fqdn/
RewriteRule ^files/(.*)$ /sites/%{HTTP_HOST}/files/$1 [L]
</IfModule>
<?php
if (file_exists("{$this->root}/.htaccess")) {
print "\n# Include the platform's htaccess file\n";
......@@ -13,10 +19,5 @@
# Do not read the platform's .htaccess
AllowOverride none
<IfModule mod_rewrite.c>
RewriteEngine on
# allow files to be accessed without /sites/fqdn/
RewriteRule ^files/(.*)$ /sites/%{HTTP_HOST}/files/$1 [L]
</IfModule>
</Directory>
......@@ -170,6 +170,8 @@ class provisionContext_server extends provisionContext {
if (provision_file()->exists($path)->status()) {
$options = array_merge(array(
'relative' => TRUE,
'keep-dirlinks' => TRUE,
'omit-dir-times' => TRUE,
'delete' => TRUE,
), $additional_options);
......@@ -182,9 +184,7 @@ class provisionContext_server extends provisionContext {
$options['delete'] = TRUE;
}
// XXX: we assume the same directory prefix on remote
$dir = dirname($path);
if (drush_core_call_rsync(escapeshellarg($path), escapeshellarg($this->script_user . '@' . $this->remote_host . ':' . $dir), $options, TRUE, FALSE)) {
if (drush_core_call_rsync(escapeshellarg($path), escapeshellarg($this->script_user . '@' . $this->remote_host . ':/'), $options, TRUE, FALSE)) {
drush_log(dt('@path has been synced to remote server @remote_host.', array('@path' => $path, '@remote_host' => $this->remote_host)));
}
else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment