Page Menu
Home
DevCentral
Search
Configure Global Search
Log In
Files
F3934191
D3044.id7769.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
3 KB
Referenced Files
None
Subscribers
None
D3044.id7769.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
@@ -56,27 +56,38 @@
- www
- assets
+webserver_alkane_static_sites:
+ dereckson.be:
+ assets: https://github.com/dereckson/assets.dereckson.be
+
+ eglide.org:
+ www: https://devcentral.nasqueron.org/source/eglide-www.git
+
+ nasqueron.org:
+ api: https://devcentral.nasqueron.org/source/api.git
+ assets: https://devcentral.nasqueron.org/source/assets.git
+ docker: https://devcentral.nasqueron.org/source/infra-docker-www.git
+ launch: https://devcentral.nasqueron.org/source/launch.git
+ packages: https://devcentral.nasqueron.org/source/packages.git
+ trustspace: https://devcentral.nasqueron.org/source/trustspace-www.git
+ www: https://devcentral.nasqueron.org/diffusion/WWW/www-nasqueron-org.git
+
+ wolfplex.org:
+ api: https://github.com/wolfplex/api-www.git
+ assets: https://github.com/wolfplex/assets.git
+ www: https://github.com/wolfplex/www.git
+
# -------------------------------------------------------------
# PHP sites
#
# 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:
@@ -115,7 +126,7 @@
subdomain: wikis
user: mediawiki
php-fpm: prod
- skipCreateAccount: True
+ skipCreateUser: True
env:
MEDIAWIKI_ENTRY_POINT: /srv/mediawiki/index.php
DB_HOST: localhost
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
Details
Attached
Mime Type
text/plain
Expires
Tue, Dec 24, 04:37 (19 h, 19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2313510
Default Alt Text
D3044.id7769.diff (3 KB)
Attached To
Mode
D3044: Don't build PHP 5.6 anymore
Attached
Detach File
Event Timeline
Log In to Comment