From b3bf626ebcf829dc461c20f80ba6805fa6dda3c4 Mon Sep 17 00:00:00 2001 From: Dave Pagini Date: Fri, 2 Dec 2016 18:16:02 -0500 Subject: [PATCH 1/2] Change private files path. --- phing/files/.gitignore | 2 +- phing/files/deploy-exclude.txt | 2 +- template/.gitignore | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phing/files/.gitignore b/phing/files/.gitignore index bc5be6736..0541d5ae4 100644 --- a/phing/files/.gitignore +++ b/phing/files/.gitignore @@ -4,7 +4,7 @@ local.* # Ignore paths that contain user-generated content. docroot/sites/*/files -docroot/sites/*/private +docroot/sites/*/files-private # OS X .DS_Store diff --git a/phing/files/deploy-exclude.txt b/phing/files/deploy-exclude.txt index 0a526864f..409db15c3 100644 --- a/phing/files/deploy-exclude.txt +++ b/phing/files/deploy-exclude.txt @@ -12,7 +12,7 @@ /docroot/libraries/contrib /docroot/modules/contrib /docroot/sites/*/files -/docroot/sites/*/private +/docroot/sites/*/files-private /docroot/themes/contrib /drush/contrib /drush.wrapper diff --git a/template/.gitignore b/template/.gitignore index c62def578..338ec4b96 100644 --- a/template/.gitignore +++ b/template/.gitignore @@ -8,7 +8,7 @@ docroot/core # Ignore paths that contain user-generated content. docroot/sites/*/files -docroot/sites/*/private +docroot/sites/*/files-private # Ignore contrib modules. These should be created during build process. docroot/modules/contrib From c124e584ae363b81bc84759667f901bed47774e8 Mon Sep 17 00:00:00 2001 From: Dave Pagini Date: Mon, 12 Dec 2016 11:38:26 -0500 Subject: [PATCH 2/2] Re-add docroot/sites/*/private path. --- phing/files/.gitignore | 1 + phing/files/deploy-exclude.txt | 1 + template/.gitignore | 1 + 3 files changed, 3 insertions(+) diff --git a/phing/files/.gitignore b/phing/files/.gitignore index 0541d5ae4..e4173b609 100644 --- a/phing/files/.gitignore +++ b/phing/files/.gitignore @@ -5,6 +5,7 @@ local.* # Ignore paths that contain user-generated content. docroot/sites/*/files docroot/sites/*/files-private +docroot/sites/*/private # OS X .DS_Store diff --git a/phing/files/deploy-exclude.txt b/phing/files/deploy-exclude.txt index 409db15c3..a9ca7d6f6 100644 --- a/phing/files/deploy-exclude.txt +++ b/phing/files/deploy-exclude.txt @@ -13,6 +13,7 @@ /docroot/modules/contrib /docroot/sites/*/files /docroot/sites/*/files-private +/docroot/sites/*/private /docroot/themes/contrib /drush/contrib /drush.wrapper diff --git a/template/.gitignore b/template/.gitignore index 338ec4b96..14badaa6e 100644 --- a/template/.gitignore +++ b/template/.gitignore @@ -9,6 +9,7 @@ docroot/core # Ignore paths that contain user-generated content. docroot/sites/*/files docroot/sites/*/files-private +docroot/sites/*/private # Ignore contrib modules. These should be created during build process. docroot/modules/contrib