Update druidfi/tools

druidfi · Aug 12, 2024 · 4222156 · 4222156
1 parent 5e0c4f9
commit 4222156
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/tools/make/Makefile b/tools/make/Makefile
@@ -34,9 +34,7 @@ debug: ## Show debug information
 	$(call dbg,COMPOSER_JSON_EXISTS,${COMPOSER_JSON_EXISTS})
 	$(call dbg,IS_DRUPAL,${IS_DRUPAL})
 	$(call dbg,IS_SYMFONY,${IS_SYMFONY})
-	$(call dbg,IS_WP,${IS_WP})
 	$(call dbg,LAGOON,${LAGOON})
-	$(call dbg,WODBY,${WODBY})
 	$(call dbg,SYSTEM,${SYSTEM})
 	$(call dbg,WEBROOT,${WEBROOT})
 	$(call dbg,UNAME_S,${UNAME_S})

diff --git a/tools/make/drupal.mk b/tools/make/drupal.mk
@@ -7,6 +7,7 @@ CLEAN_EXCLUDE += $(WEBROOT)/sites/default/files
 DRUPAL_DISABLE_MODULES ?= no
 DRUPAL_ENABLE_MODULES ?= no
 DRUPAL_PROFILE ?= minimal
+DRUPAL_SITE_EMAIL ?= maintenance@druid.fi
 DRUPAL_SYNC_FILES ?= yes
 DRUPAL_SYNC_SOURCE ?= main
 DRUSH_RSYNC_MODE ?= Pakzu
@@ -87,7 +88,7 @@ else
 endif
 drush-si: ## Site install
 	$(call step,Do Drush site:install...\n)
-	$(call drush,si ${DRUSH_SI})
+	$(call drush,si ${DRUSH_SI} --site-mail=$(DRUPAL_SITE_EMAIL))
 
 PHONY += drush-deploy
 drush-deploy: ## Run Drush deploy

diff --git a/tools/make/include.mk b/tools/make/include.mk
@@ -36,12 +36,9 @@ endif
 #
 
 LAGOON := $(shell test -f .lagoon.yml && echo yes || echo no)
-WODBY := $(shell test -f wodby.yml && echo yes || echo no)
 
 ifeq ($(LAGOON),yes)
 	SYSTEM := LAGOON
-else ifeq ($(WODBY),yes)
-	SYSTEM := WODBY
 else
 	SYSTEM := WHOKNOWS
 endif