Switch back to the upstream nginx cookbook
chef_nginx is deprecated
This commit is contained in:
@@ -14,7 +14,7 @@
|
||||
"php": ">= 0.0.0",
|
||||
"mysql": ">= 0.0.0",
|
||||
"database": ">= 0.0.0",
|
||||
"chef_nginx": ">= 0.0.0",
|
||||
"nginx": ">= 0.0.0",
|
||||
"mysql2_chef_gem": ">= 0.0.0",
|
||||
"php-fpm": ">= 0.0.0"
|
||||
},
|
||||
|
||||
@@ -9,7 +9,7 @@ depends 'apache2'
|
||||
depends 'php'
|
||||
depends 'mysql'
|
||||
depends 'database'
|
||||
depends 'chef_nginx'
|
||||
depends 'nginx'
|
||||
depends 'mysql2_chef_gem'
|
||||
depends 'php-fpm'
|
||||
|
||||
|
||||
@@ -64,5 +64,6 @@ mysql_database_user db["user"] do
|
||||
connection mysql_connection_info
|
||||
database_name db["name"]
|
||||
privileges [:all]
|
||||
password db["pass"]
|
||||
action :grant
|
||||
end
|
||||
|
||||
@@ -63,9 +63,9 @@ bash "configure_mediawiki_database" do
|
||||
cwd node["mediawiki"]["webdir"]
|
||||
code "php maintenance/install.php" +
|
||||
" --pass '" + node["mediawiki"]["admin_password"] +
|
||||
"' --dbserver 'localhost:/run/mysql-default/mysqld.sock" +
|
||||
"' --dbname '" + node["mediawiki"]["db"]["name"] +
|
||||
"' --dbuser '" + node["mediawiki"]["db"]["user"] +
|
||||
"' --dbpass '" + node["mediawiki"]["db"]["pass"] +
|
||||
"' --server '" + node["mediawiki"]["server"] +
|
||||
"' --scriptpath '" + node["mediawiki"]["scriptpath"] +
|
||||
"' --lang '" + node["mediawiki"]["language_code"] +
|
||||
|
||||
@@ -25,7 +25,7 @@ php_fpm_pool "mediawiki" do
|
||||
end
|
||||
|
||||
include_recipe "php::module_mysql"
|
||||
include_recipe "chef_nginx"
|
||||
include_recipe "nginx"
|
||||
|
||||
directory node["mediawiki"]["docroot_dir"] do
|
||||
user node['nginx']['user']
|
||||
|
||||
Reference in New Issue
Block a user