Remove the ability to specify a custom directory for mediawiki

It doesn't actually work because the timer jobs assums they can
infer the directory from the site name.

diff --git a/cookbooks/foundation/recipes/board.rb b/cookbooks/foundation/recipes/board.rb
index c7b650eb7baad83a64c452e9452411fd40520792..597733e42416e008b449199128009b0689f66f42 100644 (file)
--- a/cookbooks/foundation/recipes/board.rb
+++ b/cookbooks/foundation/recipes/board.rb
@@ -24,7 +24,6 @@ passwords = data_bag_item("foundation", "passwords")
 mediawiki_site "board.osmfoundation.org" do
   sitename "OSMF Board Wiki"
   metanamespace "OSMFBoard"
 mediawiki_site "board.osmfoundation.org" do
   sitename "OSMF Board Wiki"
   metanamespace "OSMFBoard"

-  directory "/srv/board.osmfoundation.org"

   fpm_prometheus_port 11004
   database_name "board-wiki"
   database_user "board-wikiuser"
   fpm_prometheus_port 11004
   database_name "board-wiki"
   database_user "board-wikiuser"

diff --git a/cookbooks/foundation/recipes/dwg.rb b/cookbooks/foundation/recipes/dwg.rb
index 9d9a12fc84fbf7249dbda715210be735bfa35d1f..b8fb93f61f2a9bbc00156d3a6d26e3b03258c265 100644 (file)
--- a/cookbooks/foundation/recipes/dwg.rb
+++ b/cookbooks/foundation/recipes/dwg.rb
@@ -24,7 +24,6 @@ passwords = data_bag_item("foundation", "passwords")
 mediawiki_site "dwg.osmfoundation.org" do
   sitename "OSMF Data Working Group Wiki"
   metanamespace "OSMFDWG"
 mediawiki_site "dwg.osmfoundation.org" do
   sitename "OSMF Data Working Group Wiki"
   metanamespace "OSMFDWG"

-  directory "/srv/dwg.osmfoundation.org"

   fpm_prometheus_port 11002
   database_name "dwg-wiki"
   database_user "dwg-wikiuser"
   fpm_prometheus_port 11002
   database_name "dwg-wiki"
   database_user "dwg-wikiuser"

diff --git a/cookbooks/foundation/recipes/mwg.rb b/cookbooks/foundation/recipes/mwg.rb
index b0a8240fd034512b79b58a15b7cba38cf266ef35..e9263ba0a1cc62c26a177ebf8b9d611081fc612a 100644 (file)
--- a/cookbooks/foundation/recipes/mwg.rb
+++ b/cookbooks/foundation/recipes/mwg.rb
@@ -24,7 +24,6 @@ passwords = data_bag_item("foundation", "passwords")
 mediawiki_site "mwg.osmfoundation.org" do
   sitename "OSMF Membership Working Group Wiki"
   metanamespace "OSMFMWG"
 mediawiki_site "mwg.osmfoundation.org" do
   sitename "OSMF Membership Working Group Wiki"
   metanamespace "OSMFMWG"

-  directory "/srv/mwg.osmfoundation.org"

   fpm_prometheus_port 11003
   database_name "mwg_wiki"
   database_user "mwg_wikiuser"
   fpm_prometheus_port 11003
   database_name "mwg_wiki"
   database_user "mwg_wikiuser"

diff --git a/cookbooks/foundation/recipes/wiki.rb b/cookbooks/foundation/recipes/wiki.rb
index d132cbe31bcb8f1d034cba4f132994db2f146b6c..e6ef37230a1c4a8ac9f9244c6d1cd696723e3a30 100644 (file)
--- a/cookbooks/foundation/recipes/wiki.rb
+++ b/cookbooks/foundation/recipes/wiki.rb
@@ -25,7 +25,6 @@ mediawiki_site "osmfoundation.org" do
   aliases ["wiki.osmfoundation.org", "www.osmfoundation.org",
            "foundation.openstreetmap.org", "foundation.osm.org"]
   sitename "OpenStreetMap Foundation"
   aliases ["wiki.osmfoundation.org", "www.osmfoundation.org",
            "foundation.openstreetmap.org", "foundation.osm.org"]
   sitename "OpenStreetMap Foundation"

-  directory "/srv/wiki.osmfoundation.org"

   fpm_max_children 20
   fpm_start_servers 5
   fpm_min_spare_servers 5
   fpm_max_children 20
   fpm_start_servers 5
   fpm_min_spare_servers 5

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index 476ce169904768824bbdd88221fc98a000795e9f..7bf4d5abcbebe4e59ca9ba709b39f9b8cbbd1c94 100644 (file)
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -23,7 +23,6 @@ default_action :create
 
 property :site, :kind_of => String, :name_property => true
 property :aliases, :kind_of => [String, Array]
 
 property :site, :kind_of => String, :name_property => true
 property :aliases, :kind_of => [String, Array]

-property :directory, :kind_of => String

 property :version, :kind_of => String, :default => "1.39"
 property :database_name, :kind_of => String, :required => true
 property :database_user, :kind_of => String, :required => [:create, :update]
 property :version, :kind_of => String, :default => "1.39"
 property :database_name, :kind_of => String, :required => true
 property :database_user, :kind_of => String, :required => [:create, :update]


@@ -560,7 +559,7 @@ action_class do
   include OpenStreetMap::Mixin::PersistentToken
 
   def site_directory
   include OpenStreetMap::Mixin::PersistentToken
 
   def site_directory

-    new_resource.directory || "/srv/#{new_resource.site}"
+    "/srv/#{new_resource.site}"

   end
 
   def mediawiki_reference
   end
 
   def mediawiki_reference

diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index 46a71ad8548094b2efff14665b2ed4a7775420d0..b93092031fae3683fc1c424d62f00e9f190e7fa4 100644 (file)
--- a/cookbooks/wiki/recipes/default.rb
+++ b/cookbooks/wiki/recipes/default.rb
@@ -32,7 +32,6 @@ mediawiki_site "wiki.openstreetmap.org" do
            "wiki.openstreetmap.ca", "wiki.openstreetmap.eu",
            "wiki.openstreetmap.pro", "wiki.openstreetmaps.org",
            "osm.wiki", "www.osm.wiki", "wiki.osm.wiki"]
            "wiki.openstreetmap.ca", "wiki.openstreetmap.eu",
            "wiki.openstreetmap.pro", "wiki.openstreetmaps.org",
            "osm.wiki", "www.osm.wiki", "wiki.osm.wiki"]

-  directory "/srv/wiki.openstreetmap.org"

 
   fpm_max_children 50
   fpm_start_servers 10
 
   fpm_max_children 50
   fpm_start_servers 10