diff --git a/site-cookbooks/kosmos-mediawiki/recipes/default.rb b/site-cookbooks/kosmos-mediawiki/recipes/default.rb index 52d8e3b..98963d3 100644 --- a/site-cookbooks/kosmos-mediawiki/recipes/default.rb +++ b/site-cookbooks/kosmos-mediawiki/recipes/default.rb @@ -20,8 +20,8 @@ node.override['mediawiki']['tarball']['url'] = "https://releases.wikimedia.org/ node.override['mediawiki']['language_code'] = 'en' node.override['mediawiki']['server_name'] = 'wiki.kosmos.org' 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') mediawiki_credentials = Chef::EncryptedDataBagItem.load('credentials', 'mediawiki') @@ -68,12 +68,8 @@ unless node.chef_environment == "development" notifies :reload, "service[nginx]", :delayed end end -if File.exist? "/etc/letsencrypt/live/wiki.kosmos.org/fullchain.pem" - ssl_cert = "/etc/letsencrypt/live/wiki.kosmos.org/fullchain.pem" -end -if File.exist? "/etc/letsencrypt/live/wiki.kosmos.org/privkey.pem" - ssl_key = "/etc/letsencrypt/live/wiki.kosmos.org/privkey.pem" -end +ssl_cert = "/etc/letsencrypt/live/wiki.kosmos.org/fullchain.pem" +ssl_key = "/etc/letsencrypt/live/wiki.kosmos.org/privkey.pem" template "#{node['nginx']['dir']}/sites-available/mediawiki" do source "nginx.conf.erb" variables( @@ -175,12 +171,14 @@ $wgArticlePath = "/$1"; end end -node.override["backup"]["mysql"]["host"] = "localhost" -node.override["backup"]["mysql"]["username"] = "root" -node.override["backup"]["mysql"]["password"] = node["mediawiki"]["db"]["root_password"] -unless node["backup"]["mysql"]["databases"].include? 'mediawikidb' - node.override["backup"]["mysql"]["databases"] = - node["backup"]["mysql"]["databases"].to_a << "mediawikidb" -end +unless node.chef_environment == "development" + node.override["backup"]["mysql"]["host"] = "localhost" + node.override["backup"]["mysql"]["username"] = "root" + node.override["backup"]["mysql"]["password"] = node["mediawiki"]["db"]["root_password"] + unless node["backup"]["mysql"]["databases"].include? 'mediawikidb' + node.override["backup"]["mysql"]["databases"] = + node["backup"]["mysql"]["databases"].to_a << "mediawikidb" + end -include_recipe "backup" + include_recipe "backup" +end diff --git a/site-cookbooks/kosmos-mediawiki/templates/default/nginx.conf.erb b/site-cookbooks/kosmos-mediawiki/templates/default/nginx.conf.erb index 6b35e2a..863a5c4 100644 --- a/site-cookbooks/kosmos-mediawiki/templates/default/nginx.conf.erb +++ b/site-cookbooks/kosmos-mediawiki/templates/default/nginx.conf.erb @@ -13,6 +13,7 @@ server { location / { try_files $uri $uri/ /index.php?$args; + <% if File.exist?(@ssl_cert) && File.exist?(@ssl_key) -%> set $redirect_to_ssl "no"; if ($ssl_protocol = "") { set $redirect_to_ssl "yes"; @@ -20,6 +21,7 @@ server { if ($redirect_to_ssl = yes) { rewrite ^(.*) https://$host$1 permanent; } + <% end -%> } location ~ \.php$ {