diff --git a/Makefile b/Makefile index 0d7ac91..4130f72 100644 --- 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 index 33da58a..e62ea29 100644 --- 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 index c67d153..601c2b8 100644 --- 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 new file mode 100644 index 0000000..afcf784 --- /dev/null +++ b/mk/common.mk @@ -0,0 +1 @@ +TYPE ?= jail diff --git a/mk/puppet.mk b/mk/puppet.mk index 5ff8481..1187446 100644 --- 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 index e8748d5..4d6d3f2 100644 --- 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 index 0bfc5ab..e30c231 100644 --- a/mk/service.mk +++ b/mk/service.mk @@ -1,3 +1,5 @@ +.include <${REGGAE_PATH}/mk/common.mk> + .if exists(vars.mk) .include .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 index 8d1f77b..ebed869 100644 --- a/mk/shell.mk +++ b/mk/shell.mk @@ -1,3 +1,5 @@ +.include <${REGGAE_PATH}/mk/common.mk> + PROVISIONERS += shell provision-shell: