Assume jail type if not defined

cbsd · Aug 28, 2018 · 75e5a1f · 75e5a1f
1 parent 701355a
commit 75e5a1f
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -33,6 +33,7 @@ TEMPLATES = cbsd.conf.tpl \
 ANSIBLE_TEMPLATES = ansible/inventory.local.tpl ansible/inventory.remote.tpl
 ANSIBLE_GROUP_TEMPLATES = ansible/group_vars/all.tpl
 MAKEFILES = ansible.mk \
+	    common.mk \
 	    bhyve-service.mk \
 	    chef.mk \
 	    jail-service.mk \

diff --git a/mk/ansible.mk b/mk/ansible.mk
@@ -1,3 +1,5 @@
+.include <${REGGAE_PATH}/mk/common.mk>
+
 PROVISIONERS += ansible
 ANSIBLE != sh -c "which ansible-3.6 || true"
 

diff --git a/mk/chef.mk b/mk/chef.mk
@@ -1,3 +1,5 @@
+.include <${REGGAE_PATH}/mk/common.mk>
+
 PROVISIONERS += chef
 
 provision-chef:

diff --git a/mk/common.mk b/mk/common.mk
@@ -0,0 +1 @@
+TYPE ?= jail
diff --git a/mk/puppet.mk b/mk/puppet.mk
@@ -1,3 +1,5 @@
+.include <${REGGAE_PATH}/mk/common.mk>
+
 PROVISIONERS += puppet
 
 provision-puppet:

diff --git a/mk/salt.mk b/mk/salt.mk
@@ -1,3 +1,5 @@
+.include <${REGGAE_PATH}/mk/common.mk>
+
 PROVISIONERS += salt
 
 provision-salt:

diff --git a/mk/service.mk b/mk/service.mk
@@ -1,3 +1,5 @@
+.include <${REGGAE_PATH}/mk/common.mk>
+
 .if exists(vars.mk)
 .include <vars.mk>
 .endif
@@ -9,7 +11,6 @@ UID ?= ${RUNNING_UID}
 GID ?= ${RUNNING_GID}
 DOMAIN != reggae get-config DOMAIN
 CBSD_WORKDIR != sysrc -n cbsd_workdir
-TYPE ?= jail
 EXTRA_PACKAGES =
 
 .for provisioner in ${PROVISIONERS}

diff --git a/mk/shell.mk b/mk/shell.mk
@@ -1,3 +1,5 @@
+.include <${REGGAE_PATH}/mk/common.mk>
+
 PROVISIONERS += shell
 
 provision-shell: