diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2017-11-14 20:40:42 -0200 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2017-11-14 20:40:42 -0200 |
commit | bfa39cbb7f27181980a408a3d9e691cc4f1623c0 (patch) | |
tree | f10874964913b1b656af9b2aab6dee78f78e8791 /share | |
parent | 5b102f77080b907987afae65a8e7eeb2e12951b1 (diff) | |
download | templater-bfa39cbb7f27181980a408a3d9e691cc4f1623c0.tar.gz templater-bfa39cbb7f27181980a408a3d9e691cc4f1623c0.tar.bz2 |
Drupal 8: Makefile: local overrides
Diffstat (limited to 'share')
-rw-r--r-- | share/templater/drupal8/files/Makefile | 24 | ||||
-rwxr-xr-x | share/templater/drupal8/setup | 4 |
2 files changed, 17 insertions, 11 deletions
diff --git a/share/templater/drupal8/files/Makefile b/share/templater/drupal8/files/Makefile index 8c226bb..f424f3e 100644 --- a/share/templater/drupal8/files/Makefile +++ b/share/templater/drupal8/files/Makefile @@ -3,16 +3,19 @@ # # Parameters -CORE = 8 -PROJECT = drupal -ENV = dev -CONTAINER = kvmx # vagrant or even docker -DATE = $(shell date +%Y%m%d) -CWD = $(shell pwd) -#DESTDIR ?= vendor -DESTDIR ?= /var/www/data -DRUPAL = $(DESTDIR)/drupal-$(CORE) -DRUSH = drush -r $(DRUPAL) -l $(PROJECT) +CORE = 8 +PROJECT = drupal +ENV ?= dev +CONTAINER = kvmx # vagrant or even docker +DATE = $(shell date +%Y%m%d) +CWD = $(shell pwd) +DESTDIR ?= /var/www/data # vendor +DRUPAL = $(DESTDIR)/drupal-$(CORE) +DRUSH = drush -r $(DRUPAL) -l $(PROJECT) + +# Include local customizations/overrides, which might be .gitignore'd +# See https://www.gnu.org/software/make/manual/html_node/Include.html +-include Makefile.local # Setup production environment production: submodules post_receive drush settings ownership @@ -43,7 +46,6 @@ vagrant: # Setup the virtual machine using kvmx kvmx: - kvmx up kvmx provision # Old target diff --git a/share/templater/drupal8/setup b/share/templater/drupal8/setup index 1fbaa07..470bae1 100755 --- a/share/templater/drupal8/setup +++ b/share/templater/drupal8/setup @@ -22,6 +22,10 @@ function templater_drupal8 { echo sql >> .gitignore fi + if ! grep -q "^Makefile.local" .gitignore; then + echo Makefile.local >> .gitignore + fi + if [ ! -e "settings.dev.php" ]; then cp $SHARE/drupal8/files/default.settings.php settings.dev.php #cp $SHARE/drupal8/files/default.settings.php . |