D3329.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D3329.diff
View Options

	diff --git a/Makefile b/Makefile
	--- a/Makefile
	+++ b/Makefile
	@@ -35,7 +35,9 @@
	roles/webserver-core/nginx/files/ocsp-ca-certs.pem \
	.git/hooks/pre-commit

	-roles/webserver-content/init.sls:
	+roles/webserver-content/init.sls: webserver-content-index
	+
	+webserver-content-index:
	tmpfile=`mktemp /tmp/make-rOPS-generate-webcontent-index.XXXXXX` ; \
	utils/generate-webcontent-index.py > "$$tmpfile" ;\
	${MV} "$$tmpfile" roles/webserver-content/init.sls
	diff --git a/utils/generate-webcontent-index.py b/utils/generate-webcontent-index.py
	--- a/utils/generate-webcontent-index.py
	+++ b/utils/generate-webcontent-index.py
	@@ -45,6 +45,8 @@
	print("\ninclude:")
	for site in get_sites(pillar_file):
	print(" - {}".format(site))
	+ print("")
	+ print(" - ._generic")


	def get_pillar_entry(pillar_file, key):
	@@ -55,9 +57,9 @@

	def get_sites(pillar_file):
	sites = get_pillar_entry(pillar_file, "web_content_sls")
	- return sorted(
	+ return sorted(set(
	[site for sublist in [sites[role] for role in sites] for site in sublist]
	- )
	+ ))


	def print_header(file_to_update):