D3044.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D3044.id.diff
View Options

	diff --git a/pillar/webserver/sites.sls b/pillar/webserver/sites.sls
	--- a/pillar/webserver/sites.sls
	+++ b/pillar/webserver/sites.sls
	@@ -62,21 +62,11 @@
	# Username must be unique and use max 31 characters.
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

	-php_custom_builds:
	- php56:
	- mode: release
	- version: 5.6.40
	- hash: ffd025d34623553ab2f7fd8fb21d0c9e6f9fa30dc565ca03a1d7b763023fba00
	-
	php_fpm_instances:
	- # PHP 7.2, generally installed as package/port
	+ # PHP current version, generally installed as package/port
	prod:
	command: /usr/local/sbin/php-fpm

	- # PHP 5.6, installed through php-builder unit
	- legacy:
	- command: /opt/php/php56/sbin/php-fpm
	-
	web_php_sites:
	# Nasqueron members
	mediawiki.dereckson.be:
	diff --git a/roles/webserver-legacy/php-builder/source.sls b/roles/webserver-legacy/php-builder/source.sls
	--- a/roles/webserver-legacy/php-builder/source.sls
	+++ b/roles/webserver-legacy/php-builder/source.sls
	@@ -13,10 +13,14 @@
	# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -


	+def get_custom_builds():
	+ return __pillar__.get("php_custom_builds", {})
	+
	+
	def get_release_builds():
	return {
	name: build
	- for (name, build) in __pillar__["php_custom_builds"].items()
	+ for (name, build) in get_custom_builds().items()
	if build["mode"] == "release"
	}

	@@ -34,7 +38,7 @@


	def get_build_directories():
	- return [get_build_directory(build) for build in __pillar__["php_custom_builds"]]
	+ return [get_build_directory(build) for build in get_custom_builds()]


	def get_build_directory(build):
	@@ -130,7 +134,7 @@

	# Task: build PHP
	# Task: install PHP
	- for build_name, build in __pillar__["php_custom_builds"].items():
	+ for build_name, build in get_custom_builds().items():
	build_directory = get_build_directory(build_name)
	install_directory = get_install_directory(build_name)

File Metadata

Mime Type: text/plain
Expires: Mon, Nov 18, 00:08 (44 m, 12 s)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 2249946
Default Alt Text: D3044.id.diff (1 KB)

D3044.id.diffNo OneTemporaryActions

D3044.id.diffView Options

File Metadata

Event Timeline

D3044.id.diff
No OneTemporary
Actions

D3044.id.diff
View Options