kosmos/chef
kosmos/chef
8
3
Fork 0
Code Issues 30 Pull Requests 3 Projects 2 Activity

Just use plain HTTP in development environment

Browse Source
This commit is contained in:
Greg Karékinian 2017-06-09 21:20:00 +02:00
parent 488b50d54d
commit 49a9625d16
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
site-cookbooks/kosmos-mediawiki/recipes/default.rb
View File

@ -20,8 +20,8 @@ node.override['mediawiki']['tarball']['url'] = "https://releases.wikimedia.org/
node.override['mediawiki']['language_code'] = 'en' node.override['mediawiki']['language_code'] = 'en'
node.override['mediawiki']['server_name'] = 'wiki.kosmos.org' node.override['mediawiki']['server_name'] = 'wiki.kosmos.org'
node.override['mediawiki']['site_name'] = 'Kosmos Wiki' node.override['mediawiki']['site_name'] = 'Kosmos Wiki'
node.override['mediawiki']['server'] = "https://#{node['mediawiki']['server_name']}" protocol = node.chef_environment == "development" ? "http" : "https"
node.override['mediawiki']['server'] = "#{protocol}://#{node['mediawiki']['server_name']}"
mysql_credentials = Chef::EncryptedDataBagItem.load('credentials', 'mysql') mysql_credentials = Chef::EncryptedDataBagItem.load('credentials', 'mysql')
mediawiki_credentials = Chef::EncryptedDataBagItem.load('credentials', 'mediawiki') mediawiki_credentials = Chef::EncryptedDataBagItem.load('credentials', 'mediawiki')
@ -68,12 +68,8 @@ unless node.chef_environment == "development"
notifies :reload, "service[nginx]", :delayed notifies :reload, "service[nginx]", :delayed
end end
end end
if File.exist? "/etc/letsencrypt/live/wiki.kosmos.org/fullchain.pem" ssl_cert = "/etc/letsencrypt/live/wiki.kosmos.org/fullchain.pem"
ssl_cert = "/etc/letsencrypt/live/wiki.kosmos.org/fullchain.pem" ssl_key = "/etc/letsencrypt/live/wiki.kosmos.org/privkey.pem"
end
if File.exist? "/etc/letsencrypt/live/wiki.kosmos.org/privkey.pem"
ssl_key = "/etc/letsencrypt/live/wiki.kosmos.org/privkey.pem"
end
template "#{node['nginx']['dir']}/sites-available/mediawiki" do template "#{node['nginx']['dir']}/sites-available/mediawiki" do
source "nginx.conf.erb" source "nginx.conf.erb"
variables( variables(
@ -175,12 +171,14 @@ $wgArticlePath = "/$1";
end end
end end
node.override["backup"]["mysql"]["host"] = "localhost" unless node.chef_environment == "development"
node.override["backup"]["mysql"]["username"] = "root" node.override["backup"]["mysql"]["host"] = "localhost"
node.override["backup"]["mysql"]["password"] = node["mediawiki"]["db"]["root_password"] node.override["backup"]["mysql"]["username"] = "root"
unless node["backup"]["mysql"]["databases"].include? 'mediawikidb' node.override["backup"]["mysql"]["password"] = node["mediawiki"]["db"]["root_password"]
node.override["backup"]["mysql"]["databases"] = unless node["backup"]["mysql"]["databases"].include? 'mediawikidb'
node["backup"]["mysql"]["databases"].to_a << "mediawikidb" node.override["backup"]["mysql"]["databases"] =
end node["backup"]["mysql"]["databases"].to_a << "mediawikidb"
end
include_recipe "backup" include_recipe "backup"
end

2
site-cookbooks/kosmos-mediawiki/templates/default/nginx.conf.erb
View File

@ -13,6 +13,7 @@ server {
location / { location / {
try_files $uri $uri/ /index.php?$args; try_files $uri $uri/ /index.php?$args;
<% if File.exist?(@ssl_cert) && File.exist?(@ssl_key) -%>
set $redirect_to_ssl "no"; set $redirect_to_ssl "no";
if ($ssl_protocol = "") { if ($ssl_protocol = "") {
set $redirect_to_ssl "yes"; set $redirect_to_ssl "yes";
@ -20,6 +21,7 @@ server {
if ($redirect_to_ssl = yes) { if ($redirect_to_ssl = yes) {
rewrite ^(.*) https://$host$1 permanent; rewrite ^(.*) https://$host$1 permanent;
} }
<% end -%>
} }
location ~ \.php$ { location ~ \.php$ {