Skip to content

Commit 3729e7a

Browse files
committed
Hack up something to manage certificates for birthday20
1 parent d0f4924 commit 3729e7a

File tree

3 files changed

+29
-24
lines changed

3 files changed

+29
-24
lines changed

cookbooks/blog/metadata.rb

+1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@
66

77
version "1.0.0"
88
supports "ubuntu"
9+
depends "ssl"
910
depends "wordpress"

cookbooks/blog/recipes/birthday.rb

+25-20
Original file line numberDiff line numberDiff line change
@@ -20,35 +20,35 @@
2020
include_recipe "wordpress"
2121

2222
passwords = data_bag_item("birthday20", "passwords")
23-
wp2fa_encrypt_keys = data_bag_item("birthday20", "wp2fa_encrypt_keys")
23+
# wp2fa_encrypt_keys = data_bag_item("birthday20", "wp2fa_encrypt_keys")
2424

2525
directory "/srv/birthday20.openstreetmap.org" do
2626
owner "wordpress"
2727
group "wordpress"
2828
mode "755"
2929
end
3030

31-
wordpress_site "birthday20.openstreetmap.org" do
32-
aliases ["birthday20.osm.org", "birthday20.openstreetmap.com",
33-
"birthday20.openstreetmap.net", "birthday20.openstreetmaps.org"]
34-
directory "/srv/birthday20.openstreetmap.org/wp"
35-
database_name "osm-birthday20"
36-
database_user "osm-birthday20-user"
37-
database_password passwords["osm-birthday20-user"]
38-
wp2fa_encrypt_key wp2fa_encrypt_keys["key"]
39-
fpm_prometheus_port 11403
40-
end
31+
# wordpress_site "birthday20.openstreetmap.org" do
32+
# aliases ["birthday20.osm.org", "birthday20.openstreetmap.com",
33+
# "birthday20.openstreetmap.net", "birthday20.openstreetmaps.org"]
34+
# directory "/srv/birthday20.openstreetmap.org/wp"
35+
# database_name "osm-birthday20"
36+
# database_user "osm-birthday20-user"
37+
# database_password passwords["osm-birthday20-user"]
38+
# wp2fa_encrypt_key wp2fa_encrypt_keys["key"]
39+
# fpm_prometheus_port 11403
40+
# end
4141

42-
wordpress_plugin "birthday20.openstreetmap.org-shareadraft" do
43-
action :delete
44-
plugin "shareadraft"
45-
site "birthday20.openstreetmap.org"
46-
end
42+
# wordpress_plugin "birthday20.openstreetmap.org-shareadraft" do
43+
# action :delete
44+
# plugin "shareadraft"
45+
# site "birthday20.openstreetmap.org"
46+
# end
4747

48-
wordpress_plugin "birthday20.openstreetmap.org-public-post-preview" do
49-
plugin "public-post-preview"
50-
site "birthday20.openstreetmap.org"
51-
end
48+
# wordpress_plugin "birthday20.openstreetmap.org-public-post-preview" do
49+
# plugin "public-post-preview"
50+
# site "birthday20.openstreetmap.org"
51+
# end
5252

5353
template "/etc/cron.daily/birthday20-backup" do
5454
source "backup-birthday20.cron.erb"
@@ -57,3 +57,8 @@
5757
mode "750"
5858
variables :passwords => passwords
5959
end
60+
61+
ssl_certificate new_resource.site do
62+
domains ["birthday20.openstreetmap.org", "birthday20.osm.org", "birthday20.openstreetmap.com",
63+
"birthday20.openstreetmap.net", "birthday20.openstreetmaps.org"]
64+
end

roles/birthday20.rb

+3-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
}
1414
)
1515

16-
# FIXME: Disable while site under development
17-
# run_list(
18-
# "recipe[blog::birthday]"
19-
# )
16+
run_list(
17+
"recipe[blog::birthday]"
18+
)

0 commit comments

Comments
 (0)