Page MenuHomeDevCentral
Files F3950516

D1481.diff
No OneTemporary
Actions

D1481.diff
View Options

diff --git a/pillar/saas/mediawiki.sls b/pillar/saas/mediawiki.sls
--- a/pillar/saas/mediawiki.sls
+++ b/pillar/saas/mediawiki.sls
@@ -24,7 +24,7 @@
mediawiki_directory: /srv/mediawiki
fastcgi_url: unix:/var/run/web/wikis.nasqueron.org/php-fpm.sock
db:
- host: 127.0.0.1
+ host: localhost
user: mediawiki-saas
mediawiki_datastores:
diff --git a/pillar/webserver/sites.sls b/pillar/webserver/sites.sls
--- a/pillar/webserver/sites.sls
+++ b/pillar/webserver/sites.sls
@@ -86,7 +86,7 @@
skipCreateAccount: True
env:
MEDIAWIKI_ENTRY_POINT: /srv/mediawiki/index.php
- DB_HOST: 127.0.0.1
+ DB_HOST: localhost
DB_USER: mediawiki-saas
# Wolfplex Hackerspace
diff --git a/roles/webserver-legacy/php-sites/files/php.ini b/roles/webserver-legacy/php-sites/files/php.ini
new file mode 100644
--- /dev/null
+++ b/roles/webserver-legacy/php-sites/files/php.ini
@@ -0,0 +1,20 @@
+; -------------------------------------------------------------
+; PHP configuration
+; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+; Project: Nasqueron
+; License: Trivial work, not eligible to copyright
+; Source file: roles/webserver-legacy/php-sites/files/php.ini
+; -------------------------------------------------------------
+;
+; <auto-generated>
+; This file is managed by our rOPS SaltStack repository.
+;
+; Changes to this file may cause incorrect behavior
+; and will be lost if the state is redeployed.
+; </auto-generated>
+
+[MySQLi]
+mysqli.default_socket = /var/run/mysqld/mysqld.sock
+
+[Pdo_mysql]
+pdo_mysql.default_socket = /var/run/mysqld/mysqld.sock
diff --git a/roles/webserver-legacy/php-sites/init.sls b/roles/webserver-legacy/php-sites/init.sls
--- a/roles/webserver-legacy/php-sites/init.sls
+++ b/roles/webserver-legacy/php-sites/init.sls
@@ -8,4 +8,5 @@
include:
- .account
- .files
+ - .php
- .php-fpm
diff --git a/roles/webserver-legacy/php-sites/init.sls b/roles/webserver-legacy/php-sites/php.sls
copy from roles/webserver-legacy/php-sites/init.sls
copy to roles/webserver-legacy/php-sites/php.sls
--- a/roles/webserver-legacy/php-sites/init.sls
+++ b/roles/webserver-legacy/php-sites/php.sls
@@ -1,11 +1,12 @@
# -------------------------------------------------------------
-# Salt — Provision PHP websites
+# Salt — Provision PHP websites — php-fpm pools
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
-include:
- - .account
- - .files
- - .php-fpm
+{% from "map.jinja" import dirs with context %}
+
+{{ dirs.etc }}/php.ini
+ file.managed:
+ - source: salt://roles/webserver-legacy/php-sites/files/php.ini

File Metadata

Mime Type
text/plain
Expires
Sun, Dec 29, 01:07 (14 m, 18 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2319946
Default Alt Text
D1481.diff (2 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator