D3342.id8592.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D3342.id8592.diff
View Options

	diff --git a/pillar/dbserver/cluster-A.sls b/pillar/dbserver/cluster-A.sls
	--- a/pillar/dbserver/cluster-A.sls
	+++ b/pillar/dbserver/cluster-A.sls
	@@ -142,7 +142,7 @@

	- db: mail
	user: mailManagement
	- ips: 172.27.27.5/32
	+ ips: 172.27.27.3/32
	method: password

	- db: mail
	diff --git a/pillar/nodes/nodes.sls b/pillar/nodes/nodes.sls
	--- a/pillar/nodes/nodes.sls
	+++ b/pillar/nodes/nodes.sls
	@@ -177,6 +177,8 @@
	netmask: 255.255.255.255
	roles:
	- mailserver
	+ - webserver-core
	+ - webserver-alkane

	router-001:
	forest: nasqueron-infra
	diff --git a/roles/webserver-alkane/account/init.sls b/roles/webserver-alkane/account/init.sls
	--- a/roles/webserver-alkane/account/init.sls
	+++ b/roles/webserver-alkane/account/init.sls
	@@ -43,6 +43,9 @@
	user.present:
	- name: {{ site['user' ] }}
	- fullname: {{ fqdn }}
	+{% if 'uid' in site %}
	+ - uid: {{ site['uid'] }}
	+{% endif %}
	- gid: 9003
	- system: True
	- home: /var/run/web/{{ fqdn }}
	diff --git a/top.sls b/top.sls
	--- a/top.sls
	+++ b/top.sls
	@@ -46,6 +46,8 @@
	- roles/shellserver
	'hervil':
	- roles/mailserver
	+ - roles/webserver-core
	+ - roles/webserver-alkane
	'web-001':
	- roles/webserver-core
	- roles/webserver-alkane