Compare commits
2 Commits
0c87d0cc65
...
dcdda64b9e
| Author | SHA1 | Date | |
|---|---|---|---|
| dcdda64b9e | |||
| 5cc5b04b18 |
+1
-1
@@ -1,6 +1,6 @@
|
||||
installed_nginx_sites = $(wildcard /etc/nginx/http.d/*.joeac.net.conf)
|
||||
installed_nginx_subdomains = $(installed_nginx_sites:/etc/nginx/http.d/%.joeac.net.conf=%)
|
||||
nginx_subdomains_to_remove = $(filter-out $(SUBDOMAINS),$(installed_nginx_subdomains))
|
||||
nginx_subdomains_to_remove = $(filter-out $(NGINX_SUBDOMAINS),$(installed_nginx_subdomains))
|
||||
nginx_sites_to_remove = $(nginx_subdomains_to_remove:%=/etc/nginx/http.d/%.joeac.net.conf)
|
||||
|
||||
define install_nginx_module_rule =
|
||||
|
||||
+5
-4
@@ -1,3 +1,7 @@
|
||||
SUBDOMAIN_http := @
|
||||
SUBDOMAIN_vaultwarden := pwd
|
||||
SUBDOMAIN_etherpad := docs
|
||||
SUBDOMAIN_ln := ln
|
||||
HOSTNAME := $(shell cat /etc/hostname)
|
||||
HOSTNAMES := pi-broughton blade-canongate
|
||||
MODULES_pi-broughton := http gemini smtp vaultwarden ln
|
||||
@@ -8,6 +12,7 @@ IS_MASTER_NODE := $(filter $(MASTER_NODE),$(HOSTNAME))
|
||||
NGINX_MODULES := $(if $(IS_MASTER_NODE),$(ALL_MODULES))
|
||||
MODULES := $(MODULES_$(HOSTNAME))
|
||||
SUBDOMAINS := $(foreach module,$(MODULES),$(SUBDOMAIN_$(module)))
|
||||
NGINX_SUBDOMAINS := $(foreach module,$(NGINX_MODULES),$(SUBDOMAIN_$(module)))
|
||||
COMPOSE_SERVICES := $(shell podman-compose config \
|
||||
| yq ".services | keys" --output-format csv --csv-separator " ")
|
||||
MAKE_MODULES := $(foreach module,$(MODULES),\
|
||||
@@ -19,7 +24,3 @@ PUSH_RULES := $(foreach module,$(filter $(COMPOSE_SERVICES),$(MODULES)),push_$(m
|
||||
INSTALL_RULES := $(foreach module,$(MODULES),install_$(module))
|
||||
REINSTALL_RULES := $(foreach module,$(MODULES),reinstall_$(module))
|
||||
UNINSTALL_RULES := $(foreach module,$(MODULES),uninstall_$(module))
|
||||
SUBDOMAIN_http := @
|
||||
SUBDOMAIN_vaultwarden := pwd
|
||||
SUBDOMAIN_etherpad := docs
|
||||
SUBDOMAIN_ln := ln
|
||||
|
||||
Reference in New Issue
Block a user