Remove redundant configuration

diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
index 201c69b463a7944fd60b65dbfdc7733cef36ebf0..0587f1bf59da456265f4882582e5b03b24b6b1b0 100644 (file)
--- a/.github/workflows/test-kitchen.yml
+++ b/.github/workflows/test-kitchen.yml
@@ -127,6 +127,10 @@ jobs:
             suite: osqa
           - os: debian-12
             suite: apt-repository
             suite: osqa
           - os: debian-12
             suite: apt-repository

+          - os: debian-12
+            suite: blogs
+          - os: debian-12
+            suite: community

           - os: debian-12
             suite: dev
           - os: debian-12
           - os: debian-12
             suite: dev
           - os: debian-12


@@ -139,16 +143,30 @@ jobs:
             suite: gps-tile
           - os: debian-12
             suite: imagery-tiler
             suite: gps-tile
           - os: debian-12
             suite: imagery-tiler

+          - os: debian-12
+            suite: irc

           - os: debian-12
             suite: letsencrypt
           - os: debian-12
             suite: matomo
           - os: debian-12
             suite: letsencrypt
           - os: debian-12
             suite: matomo

+          - os: debian-12
+            suite: nominatim

           - os: debian-12
             suite: otrs
           - os: debian-12
             suite: otrs

+          - os: debian-12
+            suite: overpass
+          - os: debian-12
+            suite: prometheus-server

           - os: debian-12
             suite: serverinfo
           - os: debian-12
             suite: serverinfo

+          - os: debian-12
+            suite: subversion

           - os: debian-12
             suite: supybot
           - os: debian-12
             suite: supybot

+          - os: debian-12
+            suite: taginfo
+          - os: debian-12
+            suite: trac

           - os: debian-12
             suite: vectortile
           - os: debian-12
           - os: debian-12
             suite: vectortile
           - os: debian-12


@@ -162,6 +180,10 @@ jobs:
         exclude:
           - suite: apt-repository
             os: ubuntu-2204
         exclude:
           - suite: apt-repository
             os: ubuntu-2204

+          - suite: blogs
+            os: ubuntu-2204
+          - suite: community
+            os: ubuntu-2204

           - suite: dev
             os: ubuntu-2204
           - suite: dns
           - suite: dev
             os: ubuntu-2204
           - suite: dns


@@ -172,20 +194,34 @@ jobs:
             os: ubuntu-2204
           - suite: gps-tile
             os: ubuntu-2204
             os: ubuntu-2204
           - suite: gps-tile
             os: ubuntu-2204

+          - suite: irc
+            os: ubuntu-2204

           - suite: letsencrypt
             os: ubuntu-2204
           - suite: mailman
             os: ubuntu-2204
           - suite: matomo
             os: ubuntu-2204
           - suite: letsencrypt
             os: ubuntu-2204
           - suite: mailman
             os: ubuntu-2204
           - suite: matomo
             os: ubuntu-2204

+          - suite: nominatim
+            os: ubuntu-2204

           - suite: osqa
             os: ubuntu-2204
           - suite: otrs
             os: ubuntu-2204
           - suite: osqa
             os: ubuntu-2204
           - suite: otrs
             os: ubuntu-2204

+          - suite: overpass
+            os: ubuntu-2204
+          - suite: prometheus-server
+            os: ubuntu-2204

           - suite: serverinfo
             os: ubuntu-2204
           - suite: serverinfo
             os: ubuntu-2204

+          - suite: subversion
+            os: ubuntu-2204

           - suite: supybot
             os: ubuntu-2204
           - suite: supybot
             os: ubuntu-2204

+          - suite: taginfo
+            os: ubuntu-2204
+          - suite: trac
+            os: ubuntu-2204

           - suite: vectortile
             os: ubuntu-2204
           - suite: web-cgimap
           - suite: vectortile
             os: ubuntu-2204
           - suite: web-cgimap


@@ -194,6 +230,8 @@ jobs:
             os: ubuntu-2204
           - suite: web-rails
             os: ubuntu-2204
             os: ubuntu-2204
           - suite: web-rails
             os: ubuntu-2204

+          - suite: wiki
+            os: ubuntu-2204

       fail-fast: false
     steps:
     - name: Login to GitHub Container Registry
       fail-fast: false
     steps:
     - name: Login to GitHub Container Registry

diff --git a/cookbooks/accounts/files/default/craig/.ssh/authorized_keys b/cookbooks/accounts/files/default/craig/.ssh/authorized_keys
new file mode 100644 (file)
index 0000000..101e5e1
--- /dev/null
+++ b/cookbooks/accounts/files/default/craig/.ssh/authorized_keys
@@ -0,0 +1,2 @@
+# DO NOT EDIT - This file is being maintained by Chef - use authorized_keys2 instead
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCc26tRbrQoczW3UFfXkdt6auqFg/Ut6spGMT476fFsJFjaYp98E2lca2W9vyJq4nSn0tdxwcO4LGK1ACdhZ/81I/68d7CPv5zNjJMehgwQ1BJTM5HWaap08cEINZMQ0xt6Neyz+HIFiaJVzxmyLJCnaaCeQX/t2NmL+nQV6rJq4qS2L434Bw1qGM73zjNja4bB2IN0y5yWDRTSLg+t+DKH26DC4OJn4+pxKsyt2egB7MNj9my1MRcjPVeo/bxz3nWoxKtX9dWq9UFrd7trfSXK+7Y+9fFHl41rrrYbn3UFKcDL6Rzvp2bFytDW6FlWmuptGajWnm2HpqI69bsO7uw1

diff --git a/cookbooks/community/recipes/default.rb b/cookbooks/community/recipes/default.rb
index 55238e8244ab7a9f4aa6f55218e3c2aaa0a0abee..73739ac30279648d2a0b100dcc9047e13b671b64 100644 (file)
--- a/cookbooks/community/recipes/default.rb
+++ b/cookbooks/community/recipes/default.rb
@@ -63,7 +63,7 @@ git "/srv/community.openstreetmap.org/docker" do
   action :sync
   repository "https://github.com/discourse/discourse_docker.git"
   # DANGER launch wrapper automatically updates git repo if rebuild method used: https://github.com/discourse/discourse_docker/blob/107ffb40fe8b1ea40e00814468db974a4f3f8e8f/launcher#L799
   action :sync
   repository "https://github.com/discourse/discourse_docker.git"
   # DANGER launch wrapper automatically updates git repo if rebuild method used: https://github.com/discourse/discourse_docker/blob/107ffb40fe8b1ea40e00814468db974a4f3f8e8f/launcher#L799

-  revision "e42fa9711e9a8b27e9618342b5b456d3ba5b8025"
+  revision "721facba644f645211571026d6677b015c15e5d6"

   user "root"
   group "root"
   notifies :run, "notify_group[discourse_container_new_data]"
   user "root"
   group "root"
   notifies :run, "notify_group[discourse_container_new_data]"

diff --git a/cookbooks/community/templates/default/web_only.yml.erb b/cookbooks/community/templates/default/web_only.yml.erb
index 587507a43449c4d5eaf2febeac0c442b0210865a..fddb054a97a6e3fa652d8a9460cfe6b9d2217cd0 100644 (file)
--- a/cookbooks/community/templates/default/web_only.yml.erb
+++ b/cookbooks/community/templates/default/web_only.yml.erb
@@ -19,7 +19,7 @@ links:
 # any extra arguments for Docker?
 # docker_args:
 
 # any extra arguments for Docker?
 # docker_args:
 

-# Latest Version v3.4.2
+# Latest Version v3.4.3

 # Discourse only support tests-passed and stable branches
 params:
   version: stable
 # Discourse only support tests-passed and stable branches
 params:
   version: stable

diff --git a/cookbooks/devices/metadata.rb b/cookbooks/devices/metadata.rb
index 2f71f6857b3a3bb87e5038a22e0db59404297d2c..a25b0e16f047dcd658f3a8f22403b46a97b29ad8 100644 (file)
--- a/cookbooks/devices/metadata.rb
+++ b/cookbooks/devices/metadata.rb
@@ -6,3 +6,4 @@ description      "Configures devices"
 
 version          "0.1"
 supports         "ubuntu"
 
 version          "0.1"
 supports         "ubuntu"

+depends          "chef"

diff --git a/cookbooks/devices/templates/default/udev.rules.erb b/cookbooks/devices/templates/default/udev.rules.erb
index be990389110e34fa05a7ce398c662a6fb63f5ccc..ad2451afa994cca1f159f10f758432595d2e7833 100644 (file)
--- a/cookbooks/devices/templates/default/udev.rules.erb
+++ b/cookbooks/devices/templates/default/udev.rules.erb
@@ -95,47 +95,6 @@ SUBSYSTEM=="net", ACTION=="add", ATTRS{vendor}=="0x8086", ATTRS{device}=="0x37d2
 # Disable Firmware Based LLDP handler
 SUBSYSTEM=="net", ACTION=="add", ENV{INTERFACE}=="*", DRIVERS=="i40e", RUN+="/sbin/ethtool --set-priv-flags $name disable-fw-lldp on"
 
 # Disable Firmware Based LLDP handler
 SUBSYSTEM=="net", ACTION=="add", ENV{INTERFACE}=="*", DRIVERS=="i40e", RUN+="/sbin/ethtool --set-priv-flags $name disable-fw-lldp on"
 

-# Workaround unreliable Western Digital WD RE3/RE4 disks (ATA only)
-# Set sufficent Linux subsystem timeout and fix severe NCQ performance issue
-ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_BUS}=="ata", ENV{ID_MODEL}=="WDC_WD5002ABYS-02B1B0", ATTR{device/timeout}="90", ATTR{device/queue_depth}="1", ATTR{queue/nr_requests}="256"
-ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_BUS}=="ata", ENV{ID_MODEL}=="WDC_WD1002FBYS-02A6B0", ATTR{device/timeout}="90", ATTR{device/queue_depth}="1", ATTR{queue/nr_requests}="256"
-ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_BUS}=="ata", ENV{ID_MODEL}=="WDC_WD1003FBYX-01Y7B0", ATTR{device/timeout}="90", ATTR{device/queue_depth}="1", ATTR{queue/nr_requests}="256"
-# Disable Disk Write Cache, Set AAM and Power Management correctly
-ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_BUS}=="ata", ENV{ID_MODEL}=="WDC_WD1002FBYS-02A6B0", RUN+="/sbin/hdparm -q -W0 -q -M254 $env{DEVNAME}"
-ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_BUS}=="ata", ENV{ID_MODEL}=="WDC_WD1003FBYX-01Y7B0", RUN+="/sbin/hdparm -q -W0 -q -M254 -q -B254 $env{DEVNAME}"
-
-# Set Disks TLED / SCT Error Recovery Control
-ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_BUS}=="ata", ENV{ID_MODEL}=="WDC_WD1002FBYS-02A6B0", RUN+="/usr/sbin/smartctl -q errorsonly -l scterc,70,70 $env{DEVNAME}"
-ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_BUS}=="ata", ENV{ID_MODEL}=="WDC_WD1003FBYX-01Y7B0", RUN+="/usr/sbin/smartctl -q errorsonly -l scterc,70,70 $env{DEVNAME}"
-ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_BUS}=="ata", ENV{ID_MODEL}=="WDC_WD5000AAKS-00A7B0", RUN+="/usr/sbin/smartctl -q errorsonly -l scterc,70,70 $env{DEVNAME}"
-ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_BUS}=="ata", ENV{ID_MODEL}=="WDC_WD2000FYYZ-01UL1B2", RUN+="/usr/sbin/smartctl -q errorsonly -l scterc,70,70 $env{DEVNAME}"
-ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_BUS}=="ata", ENV{ID_MODEL}=="TOSHIBA_DT01ACA300", RUN+="/usr/sbin/smartctl -q errorsonly -l scterc,70,70 $env{DEVNAME}"
-ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_BUS}=="ata", ENV{ID_MODEL}=="ST31000340NS", RUN+="/usr/sbin/smartctl -q errorsonly -l scterc,100,100 $env{DEVNAME}"
-ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_BUS}=="ata", ENV{ID_MODEL}=="HGST_HTS725050A7E630", RUN+="/usr/sbin/smartctl -q errorsonly -l scterc,100,100 $env{DEVNAME}"
-ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_BUS}=="ata", ENV{ID_MODEL}=="HGST_HTE721010A9E630", RUN+="/usr/sbin/smartctl -q errorsonly -l scterc,100,100 $env{DEVNAME}"
-
-# Add SSD optimisation
-ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_BUS}=="ata", ENV{ID_MODEL}=="OCZ-VERTEX3", ATTR{queue/read_ahead_kb}="4096"
-ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_BUS}=="ata", ENV{ID_MODEL}=="OCZ-VERTEX3", ATTR{queue/scheduler}="noop"
-
-ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_BUS}=="ata", ENV{ID_MODEL}=="Samsung_SSD_840_PRO_*", ATTR{queue/read_ahead_kb}="4096"
-ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_BUS}=="ata", ENV{ID_MODEL}=="Samsung_SSD_840_PRO_*", ATTR{queue/scheduler}="noop"
-ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_BUS}=="ata", ENV{ID_MODEL}=="Samsung_SSD_840_PRO_*", ATTR{queue/read_ahead_kb}="256"
-
-ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_BUS}=="ata", ENV{ID_MODEL}=="Samsung_SSD_850_PRO_*", ATTR{queue/read_ahead_kb}="4096"
-ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_BUS}=="ata", ENV{ID_MODEL}=="Samsung_SSD_850_PRO_*", ATTR{queue/scheduler}="noop"
-ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_BUS}=="ata", ENV{ID_MODEL}=="Samsung_SSD_850_PRO_*", ATTR{queue/read_ahead_kb}="256"
-
-ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_BUS}=="ata", ENV{ID_MODEL}=="Samsung_SSD_860_PRO_*", ATTR{queue/read_ahead_kb}="4096"
-ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_BUS}=="ata", ENV{ID_MODEL}=="Samsung_SSD_860_PRO_*", ATTR{queue/scheduler}="noop"
-ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_BUS}=="ata", ENV{ID_MODEL}=="Samsung_SSD_860_PRO_*", ATTR{queue/read_ahead_kb}="256"
-
-ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_BUS}=="ata", ENV{ID_MODEL}=="ST240FN0021", ATTR{queue/read_ahead_kb}="4096"
-ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_BUS}=="ata", ENV{ID_MODEL}=="ST240FN0021", ATTR{queue/scheduler}="noop"
-
-ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_BUS}=="ata", ENV{ID_MODEL}=="SuperMicro_SSD", ATTR{queue/read_ahead_kb}="4096"
-ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_BUS}=="ata", ENV{ID_MODEL}=="SuperMicro_SSD", ATTR{queue/scheduler}="noop"
-

 # Delete failed disk in cmok
 ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_BUS}=="ata", ENV{ID_MODEL}=="ST_M13FQBL", ENV{ID_SERIAL}=="ST_M13FQBL_QNR_BFW", ATTR{device/delete}="1"
 
 # Delete failed disk in cmok
 ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_BUS}=="ata", ENV{ID_MODEL}=="ST_M13FQBL", ENV{ID_SERIAL}=="ST_M13FQBL_QNR_BFW", ATTR{device/delete}="1"
 


@@ -155,6 +114,8 @@ ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_MODEL}=="QEMU_HA
 ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_MODEL}=="QEMU_HARDDISK", ATTR{queue/scheduler}="noop"
 # Vendor is sometimes missing
 
 ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{ID_MODEL}=="QEMU_HARDDISK", ATTR{queue/scheduler}="noop"
 # Vendor is sometimes missing
 

-# Increase default MD raid5/raid6 strip cache + group_thread_cnt
-ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{MD_LEVEL}=="raid5", ATTR{md/stripe_cache_size}="8192", ATTR{md/group_thread_cnt}="4"
-ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{MD_LEVEL}=="raid6", ATTR{md/stripe_cache_size}="8192", ATTR{md/group_thread_cnt}="4"
+# Tune md stripe cache and thread count for RAID-5 / RAID-6 arrays
+<%
+  group_threads = [(node.cpu_cores.to_i / 2.0).round, 4].max
+%>
+ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", ENV{MD_LEVEL}=="raid[56]", ATTR{md/stripe_cache_size}="8192", ATTR{md/group_thread_cnt}="<%= group_threads %>"

diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index a7a23b9130745fc9ae3789d485db49f59f87981e..9d55876a6e026d50f474cfef20d6c7e39dc7e551 100644 (file)
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -54,6 +54,7 @@ property :fpm_max_spare_servers, :kind_of => Integer, :default => 3
 property :fpm_request_terminate_timeout, :kind_of => Integer, :default => 120
 property :fpm_prometheus_port, :kind_of => Integer
 property :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true
 property :fpm_request_terminate_timeout, :kind_of => Integer, :default => 120
 property :fpm_prometheus_port, :kind_of => Integer
 property :reload_apache, :kind_of => [TrueClass, FalseClass], :default => true

+property :backup_enabled, :kind_of => [TrueClass, FalseClass], :default => true

 
 action :create do
   node.default[:mediawiki][:sites][new_resource.site] = {
 
 action :create do
   node.default[:mediawiki][:sites][new_resource.site] = {


@@ -176,6 +177,12 @@ action :create do
               :directory => site_directory,
               :database_params => database_params
     only_if { ::File.exist?("#{mediawiki_directory}/LocalSettings.php") }
               :directory => site_directory,
               :database_params => database_params
     only_if { ::File.exist?("#{mediawiki_directory}/LocalSettings.php") }

+    only_if { new_resource.backup_enabled }
+  end
+
+  file "/etc/cron.daily/mediawiki-#{cron_name}-backup" do
+    action :delete
+    only_if { !new_resource.backup_enabled }

   end
 
   # MobileFrontend extension is required by MinervaNeue skin
   end
 
   # MobileFrontend extension is required by MinervaNeue skin

diff --git a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
index da4bb988066a19bd8160bcf7b51d9b73b710088e..9671130d899e4317a68df0f0415d1c2b5fd033cf 100644 (file)
--- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
+++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
@@ -368,3 +368,7 @@ $wgHTTPTimeout = 240;
 $wgMinervaNightMode['base'] = true;
 $wgVectorNightMode['logged_in'] = true;
 $wgVectorNightMode['logged_out'] = true;
 $wgMinervaNightMode['base'] = true;
 $wgVectorNightMode['logged_in'] = true;
 $wgVectorNightMode['logged_out'] = true;

+
+# Set extremely low timeout to avoid PHP-FPM timeouts on slow connections to Wikimedia Commons (rate limiting) or similar
+$wgHTTPMaxTimeout = 5;
+$wgHTTPMaxConnectTimeout = 3;

diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index 04971a0541b232a5b6a9a570310fc9bca6b32b21..0590346f38521434bfc08f9600511e4f3353d0b2 100644 (file)
--- a/cookbooks/wiki/recipes/default.rb
+++ b/cookbooks/wiki/recipes/default.rb
@@ -72,6 +72,10 @@ mediawiki_site site_name do
 
   site_notice node[:wiki][:site_notice]
   site_readonly node[:wiki][:site_readonly]
 
   site_notice node[:wiki][:site_notice]
   site_readonly node[:wiki][:site_readonly]

+
+  if node[:wiki][:test_mode]
+    backup_enabled false
+  end

 end
 
 mediawiki_extension "CodeEditor" do
 end
 
 mediawiki_extension "CodeEditor" do


@@ -138,6 +142,24 @@ end
 
 mediawiki_extension "TemplateStyles" do
   site site_name
 
 mediawiki_extension "TemplateStyles" do
   site site_name

+end
+
+mediawiki_extension "DynamicPageListEngine" do
+  site site_name
+  only_if { node[:wiki][:test_mode] }
+end
+
+mediawiki_extension "WikibaseCirrusSearch" do
+  site site_name
+  template "mw-ext-WikibaseCirrusSearch.inc.php.erb"
+  template_cookbook "wiki"
+  only_if { node[:wiki][:test_mode] }
+end
+
+mediawiki_extension "Translate" do
+  site site_name
+  template "mw-ext-Translate.inc.php.erb"
+  template_cookbook "wiki"

   only_if { node[:wiki][:test_mode] }
 end
 
   only_if { node[:wiki][:test_mode] }
 end
 

diff --git a/cookbooks/wiki/templates/default/mw-ext-Translate.inc.php.erb b/cookbooks/wiki/templates/default/mw-ext-Translate.inc.php.erb
new file mode 100644 (file)
index 0000000..8221ea3
--- /dev/null
+++ b/cookbooks/wiki/templates/default/mw-ext-Translate.inc.php.erb
@@ -0,0 +1,39 @@
+<?php
+# DO NOT EDIT - This file is being maintained by Chef
+wfLoadExtension( 'Translate' );
+
+/**
+ * Allow all confirmed users to edit translations.
+ */
+$wgGroupPermissions['autoconfirmed']['translate'] = true;
+
+/**
+ * Allow all confirmed users to review translations.
+ */
+$wgGroupPermissions['autoconfirmed']['translate-messagereview'] = true;
+
+/**
+ * Allow all translations administrators to manage translations.
+ */
+$wgGroupPermissions['translationadmin']['pagetranslation'] = true;
+$wgGroupPermissions['translationadmin']['translate-manage'] = true;
+
+/**
+ * Language code for message documentation. Suggested values are qqq or info.
+ * If set to false (default), message documentation feature is disabled.
+ */
+$wgTranslateDocumentationLanguageCode = 'qqq';
+
+/**
+ * Let Translate extension use ElasticSearch to store commonly-used translation messages to suggest to translators
+ */
+$wgTranslateTranslationServices['TTMServer'] = [
+        'type' => 'ttmserver',
+        'class' => 'ElasticSearchTTMServer',
+        'cutoff' => 0.75,
+        /*
+         * See http://elastica.io/getting-started/installation.html
+         * See https://github.com/ruflin/Elastica/blob/8.x/src/Client.php
+         */
+        'config' => [ 'servers' => [ 'host' => '127.0.0.1', 'port' => 9114 ] ]
+];

diff --git a/cookbooks/wiki/templates/default/mw-ext-WikibaseCirrusSearch.inc.php.erb b/cookbooks/wiki/templates/default/mw-ext-WikibaseCirrusSearch.inc.php.erb
new file mode 100644 (file)
index 0000000..e6859b7
--- /dev/null
+++ b/cookbooks/wiki/templates/default/mw-ext-WikibaseCirrusSearch.inc.php.erb
@@ -0,0 +1,6 @@
+<?php
+# DO NOT EDIT - This file is being maintained by Chef
+wfLoadExtension( 'WikibaseCirrusSearch' );
+
+# Enable cirrus search
+$wgWBCSUseCirrus = true;

diff --git a/cookbooks/wiki/templates/default/robots.txt.erb b/cookbooks/wiki/templates/default/robots.txt.erb
index 932d07ebacda4aedd0da02162a9a5a9404ddea59..8d167108fe5b775112709e270f828faa1c6af968 100644 (file)
--- a/cookbooks/wiki/templates/default/robots.txt.erb
+++ b/cookbooks/wiki/templates/default/robots.txt.erb
@@ -1,3 +1,7 @@
+<% if node[:wiki][:test_mode] -%>
+User-agent: *
+Disallow: /
+<% else -%>

 User-agent: ia_archiver
 Allow: /
 
 User-agent: ia_archiver
 Allow: /
 


@@ -31,3 +35,4 @@ Crawl-delay: 60
 Sitemap: https://wiki.openstreetmap.org/sitemap-index-wiki.xml
 
 Host: wiki.openstreetmap.org
 Sitemap: https://wiki.openstreetmap.org/sitemap-index-wiki.xml
 
 Host: wiki.openstreetmap.org

+<% end -%>

diff --git a/roles/cmok.rb b/roles/cmok.rb
index 7b637b2e779368559cca2a5ca8750ff83b69c385..1740ee18cb1459978713b4e788db4e39c2a5bb54 100644 (file)
--- a/roles/cmok.rb
+++ b/roles/cmok.rb
@@ -34,7 +34,6 @@ default_attributes(
   },
   :vectortile => {
     :replication => {
   },
   :vectortile => {
     :replication => {

-      :enabled => false,

       :tileupdate => false
     },
     :spirit => {
       :tileupdate => false
     },
     :spirit => {

diff --git a/roles/fafnir.rb b/roles/fafnir.rb
index e7edc263cdc3fbb94cb17c4d4c6be28b2059b3c2..dfed57f7f4217259fa6d0b3da111a6d7533fbac1 100644 (file)
--- a/roles/fafnir.rb
+++ b/roles/fafnir.rb
@@ -7,7 +7,6 @@ default_attributes(
     :last_address => "10.0.79.254"
   },
   :exim => {
     :last_address => "10.0.79.254"
   },
   :exim => {

-    :external_interface => "<;${if <{${randint:100}}{75} {184.104.226.98;2001:470:1:b3b::2}{87.252.214.98;2001:4d78:fe03:1c::2}}",

     :routes => {
       :openstreetmap => {
         :comment => "openstreetmap.org",
     :routes => {
       :openstreetmap => {
         :comment => "openstreetmap.org",