Skip to content

Commit

Permalink
Add basic en.openstreetmap.town redirect service
Browse files Browse the repository at this point in the history
  • Loading branch information
Firefishy committed Nov 28, 2023
1 parent 1859ef7 commit d5ae34c
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 0 deletions.
1 change: 1 addition & 0 deletions .github/workflows/test-kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ jobs:
- fail2ban
- foundation-board
- foundation-dwg
- foundation-mastodon
- foundation-mwg
- foundation-owg
- foundation-welcome
Expand Down
6 changes: 6 additions & 0 deletions .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ suites:
- name: blogs
run_list:
- recipe[blogs::default]
- name: chef
run_list:
- recipe[chef::default]
- name: civicrm
run_list:
- recipe[civicrm::default]
Expand Down Expand Up @@ -153,6 +156,9 @@ suites:
- name: foundation-dwg
run_list:
- recipe[foundation::dwg]
- name: foundation-mastodon
run_list:
- recipe[foundation::mastodon]
- name: foundation-mwg
run_list:
- recipe[foundation::mwg]
Expand Down
25 changes: 25 additions & 0 deletions cookbooks/foundation/recipes/mastodon.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#
# Cookbook:: foundation
# Recipe:: mastodon
#
# Copyright:: 2023, OpenStreetMap Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

include_recipe "podman::apache"

podman_site "en.openstreetmap.town" do
image "ghcr.io/openstreetmap/owg-website:latest"
aliases ["operations.openstreetmap.org", "operations.osm.org"]
end
1 change: 1 addition & 0 deletions roles/naga.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"role[blogs]",
"role[munin]",
"role[switch2osm]",
"recipe[foundation::mastodon]",
"recipe[foundation::owg]",
"recipe[foundation::welcome]",
"recipe[stateofthemap::container]",
Expand Down
18 changes: 18 additions & 0 deletions test/integration/foundation-mastodon/inspec/apache_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
describe package("apache2") do
it { should be_installed }
end

describe service("apache2") do
it { should be_enabled }
it { should be_running }
end

describe port(80) do
it { should be_listening }
its("protocols") { should cmp "tcp" }
end

describe port(443) do
it { should be_listening }
its("protocols") { should cmp "tcp" }
end

0 comments on commit d5ae34c

Please sign in to comment.