Manage OSMF wiki

diff --git a/cookbooks/foundation/README.md b/cookbooks/foundation/README.md
new file mode 100644 (file)
index 0000000..2057391
--- /dev/null
+++ b/cookbooks/foundation/README.md
@@ -0,0 +1,34 @@
+Cookbook
+========
+TODO: Enter the cookbook description here.
+
+e.g.
+This cookbook makes your favorite breakfast sandwich.
+
+Requirements
+------------
+TODO: List your cookbook requirements. Be sure to include any requirements this cookbook has on platforms, libraries, other cookbooks, packages, operating systems, etc.
+
+Attributes
+----------
+TODO: List you cookbook attributes here.
+
+Usage
+-----
+TODO: Write usage instructions for each cookbook.
+
+Contributing
+------------
+TODO: (optional) If this is a public cookbook, detail the process for contributing. If this is a private cookbook, remove this section.
+
+e.g.
+1. Fork the repository on Github
+2. Create a named feature branch (like `add_component_x`)
+3. Write your change
+4. Write tests for your change (if applicable)
+5. Run the tests, ensuring they all pass
+6. Submit a Pull Request using Github
+
+License and Authors
+-------------------
+Authors: TODO: List authors

diff --git a/cookbooks/foundation/files/default/Wiki.png b/cookbooks/foundation/files/default/Wiki.png
new file mode 100644 (file)
index 0000000..62d95d0
Binary files /dev/null and b/cookbooks/foundation/files/default/Wiki.png differ

diff --git a/cookbooks/foundation/metadata.rb b/cookbooks/foundation/metadata.rb
new file mode 100644 (file)
index 0000000..fb40d15
--- /dev/null
+++ b/cookbooks/foundation/metadata.rb
@@ -0,0 +1,8 @@
+name              "foundation"
+maintainer        "OpenStreetMap Administrators"
+maintainer_email  "admins@openstreetmap.org"
+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"
+depends           "mediawiki"

diff --git a/cookbooks/foundation/recipes/wiki.rb b/cookbooks/foundation/recipes/wiki.rb
new file mode 100644 (file)
index 0000000..661afb3
--- /dev/null
+++ b/cookbooks/foundation/recipes/wiki.rb
@@ -0,0 +1,40 @@
+#
+# Cookbook Name:: foundation
+# Recipe:: wiki
+#
+# Copyright 2014, 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 "mediawiki"
+
+passwords = data_bag_item("foundation", "passwords")
+
+mediawiki_site  "wiki.osmfoundation.org" do
+  aliases "www.osmfoundation.org", "osmfoundation.org"
+  directory "/srv/wiki.osmfoundation.org"
+  database_name "osmf-wiki"
+  database_username "osmf-wikiuser"
+  database_password passwords["wiki"]["database"]
+  logo "/Wiki.png"
+  email_contact "webmaster@openstreetmap.org"
+  email_sender "webmaster@openstreetmap.org"
+  email_sender_name "OSMF Wiki"
+end
+
+cookbook_file "/srv/wiki.osmfoundation.org/Wiki.png" do
+  owner node[:mediawiki][:user]
+  group node[:mediawiki][:group]
+  mode 0644
+end

diff --git a/cookbooks/mediawiki/definitions/mediawiki_extension.rb b/cookbooks/mediawiki/definitions/mediawiki_extension.rb
index 9b7e665c16fe891c21f3aec0d95d980936f170d2..91c3116569da10c75680ee07ad49288d4172cce1 100644 (file)
--- a/cookbooks/mediawiki/definitions/mediawiki_extension.rb
+++ b/cookbooks/mediawiki/definitions/mediawiki_extension.rb
@@ -51,7 +51,7 @@ define :mediawiki_extension, :action => [ :enable ] do
       action :sync
       repository repository
       reference reference
       action :sync
       repository repository
       reference reference

-      depth 1
+      #depth 1

       enable_submodules true
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
       enable_submodules true
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]

diff --git a/cookbooks/mediawiki/definitions/mediawiki_site.rb b/cookbooks/mediawiki/definitions/mediawiki_site.rb
index 1cfd2a40c25c8d110c7f973a3c14bf1c2bc308ae..81751fb377354178e8e3ef41059c8c0040aac081 100644 (file)
--- a/cookbooks/mediawiki/definitions/mediawiki_site.rb
+++ b/cookbooks/mediawiki/definitions/mediawiki_site.rb
@@ -120,7 +120,7 @@ define :mediawiki_site, :action => [ :create, :enable ] do
     action :sync
     repository mediawiki_repository
     reference mediawiki_reference
     action :sync
     repository mediawiki_repository
     reference mediawiki_reference

-    depth 1
+    #depth 1

     user node[:mediawiki][:user]
     group node[:mediawiki][:group]
     notifies :run, resources(:execute => "#{mediawiki[:directory]}/maintenance/install.php"), :immediately
     user node[:mediawiki][:user]
     group node[:mediawiki][:group]
     notifies :run, resources(:execute => "#{mediawiki[:directory]}/maintenance/install.php"), :immediately

diff --git a/roles/foundation.rb b/roles/foundation.rb
index ba3a3ab78d22103f0fe75e254ace0046e4e20013..2add69e2e841696f7596d17a28b538291ee7acd4 100644 (file)
--- a/roles/foundation.rb
+++ b/roles/foundation.rb
@@ -18,5 +18,6 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[crm]"
+  "role[crm]",
+  "recipe[foundation::wiki]"

 )
 )