Add operations.osmfoundation.org site to ridley

diff --git a/cookbooks/foundation/metadata.rb b/cookbooks/foundation/metadata.rb
index f048278be3040620100b3f5b5f4e10464227e918..3a2bec7657a8afed39ba1a8ac937b0dd89ab6106 100644 (file)
--- a/cookbooks/foundation/metadata.rb
+++ b/cookbooks/foundation/metadata.rb
@@ -5,4 +5,6 @@ license           "Apache 2.0"
 description       "Installs and configures foundation services"
 long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))
 version           "1.0.0"
 description       "Installs and configures foundation services"
 long_description  IO.read(File.join(File.dirname(__FILE__), "README.md"))
 version           "1.0.0"

+depends           "apache"
+depends           "git"

 depends           "mediawiki"
 depends           "mediawiki"

diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb
new file mode 100644 (file)
index 0000000..ee68631
--- /dev/null
+++ b/cookbooks/foundation/recipes/owg.rb
@@ -0,0 +1,53 @@
+#
+# Cookbook Name:: foundation
+# Recipe:: owg
+#
+# Copyright 2016, 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
+#
+#     http://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 "apache::ssl"
+include_recipe "git"
+
+package "ruby"
+package "ruby-dev"
+
+gem_package "jekyll"
+
+git "/srv/operations.osmfoundation.org" do
+  action :sync
+  repository "git://github.com/gravitystorm/owg-log.git"
+  user "root"
+  group "root"
+  notifies :run, "execute[/srv/operations.osmfoundation.org]"
+end
+
+directory "/srv/operations.osmfoundation.org/_site" do
+  mode 0o755
+  owner "nobody"
+  group "nogroup"
+end
+
+execute "/srv/operations.osmfoundation.org" do
+  action :nothing
+  command "jekyll build --trace"
+  cwd "/srv/operations.osmfoundation.org"
+  user "nobody"
+  group "nogroup"
+end
+
+apache_site "operations.osmfoundation.org" do
+  template "apache.owg.erb"
+  directory "/srv/operations.osmfoundation.org/_site"
+end

diff --git a/cookbooks/foundation/templates/default/apache.owg.erb b/cookbooks/foundation/templates/default/apache.owg.erb
new file mode 100644 (file)
index 0000000..1cb0fe4
--- /dev/null
+++ b/cookbooks/foundation/templates/default/apache.owg.erb
@@ -0,0 +1,27 @@
+# DO NOT EDIT - This file is being maintained by Chef
+
+<VirtualHost *:80>
+   ServerName <%= @name %>
+   ServerAdmin webmaster@openstreetmap.org
+
+   CustomLog /var/log/apache2/<%= @name %>-access.log combined
+   ErrorLog /var/log/apache2/<%= @name %>-error.log
+
+   Redirect permanent / https://<%= @name %>/
+</VirtualHost>
+
+<VirtualHost *:443>
+   ServerName <%= @name %>
+   ServerAdmin webmaster@openstreetmap.org
+
+   CustomLog /var/log/apache2/<%= @name %>-access.log combined
+   ErrorLog /var/log/apache2/<%= @name %>-error.log
+
+   DocumentRoot <%= @directory %>
+
+   SSLEngine on
+</VirtualHost>
+
+<Directory <%= @directory %>>
+   Require all granted
+</Directory>

diff --git a/roles/foundation.rb b/roles/foundation.rb
index 4926edeb2e59fbdd990c471fc92f9f5a6613ba30..06c38c419ce01491df29b1d072f60ec11c3b609e 100644 (file)
--- a/roles/foundation.rb
+++ b/roles/foundation.rb
@@ -30,5 +30,6 @@ run_list(
   "role[elasticsearch]",
   "recipe[foundation::wiki]",
   "recipe[foundation::board]",
   "role[elasticsearch]",
   "recipe[foundation::wiki]",
   "recipe[foundation::board]",

-  "recipe[foundation::dwg]"
+  "recipe[foundation::dwg]",
+  "recipe[foundation::owg]"

 )
 )