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

Update kosmos-mediawiki cookbook for Ubuntu 16.04

Browse Source
This commit is contained in:
Greg Karékinian
2017-03-31 19:21:00 +02:00
parent b85c4ad3d5
commit 827a7428e2
3 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
site-cookbooks/kosmos-mediawiki/recipes/default.rb
+22 -10
View File
@@ -50,22 +50,30 @@ end
include_recipe "mediawiki"
include_recipe "kosmos-nginx"
include_recipe "mediawiki::nginx"
include_recipe "kosmos-base::letsencrypt"
execute "letsencrypt cert for wiki.kosmos.org" do
command "./certbot-auto certonly --webroot --agree-tos --email ops@5apps.com --webroot-path #{node["mediawiki"]["docroot_dir"]} -d wiki.kosmos.org -n"
cwd "/usr/local/certbot"
not_if { File.exist? "/etc/letsencrypt/live/wiki.kosmos.org/fullchain.pem" }
notifies :reload, "service[nginx]", :delayed
unless node.chef_environment == "development"
include_recipe "kosmos-base::letsencrypt"
execute "letsencrypt cert for wiki.kosmos.org" do
command "./certbot-auto certonly --webroot --agree-tos --email ops@5apps.com --webroot-path #{node["mediawiki"]["docroot_dir"]} -d wiki.kosmos.org -n"
cwd "/usr/local/certbot"
not_if { File.exist? "/etc/letsencrypt/live/wiki.kosmos.org/fullchain.pem" }
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
template "#{node['nginx']['dir']}/sites-available/mediawiki" do
source "nginx.conf.erb"
variables(
docroot: node['mediawiki']['webdir'],
server_name: node['mediawiki']['server_name'],
ssl_cert: "/etc/letsencrypt/live/wiki.kosmos.org/fullchain.pem",
ssl_key: "/etc/letsencrypt/live/wiki.kosmos.org/privkey.pem"
ssl_cert: ssl_cert,
ssl_key: ssl_key
)
action :create
notifies :reload, "service[nginx]", :delayed
@@ -90,7 +98,11 @@ end
# MediawikiHubot extension
# requires curl extension
package "php5-curl"
if platform?('ubuntu') && node[:platform_version].to_f < 16.04
package "php5-curl"
else
package "php-curl"
end
ark "MediawikiHubot" do
url "https://github.com/67P/mediawiki-hubot/archive/master.zip"