Merge pull request #360 from Firefishy/torrent-rss

Torrent rss

diff --git a/cookbooks/civicrm/attributes/default.rb b/cookbooks/civicrm/attributes/default.rb
index aed7dedef4abc909d8c03c8b3d3e1d45bdb6880f..d39879eb06bdfcb81ee2c8b01052122ab2039d57 100644 (file)
--- a/cookbooks/civicrm/attributes/default.rb
+++ b/cookbooks/civicrm/attributes/default.rb
@@ -1,8 +1,8 @@
-default[:civicrm][:version] = "5.30.1"
+default[:civicrm][:version] = "5.31.0"
 
 default[:civicrm][:extensions][:cividiscount][:name] = "org.civicrm.module.cividiscount"
 default[:civicrm][:extensions][:cividiscount][:repository] = "https://github.com/dlobo/org.civicrm.module.cividiscount.git"
-default[:civicrm][:extensions][:cividiscount][:revision] = "3.8.1"
+default[:civicrm][:extensions][:cividiscount][:revision] = "3.8.2"
 
 default[:civicrm][:extensions][:osm][:name] = "de.systopia.osm"
 default[:civicrm][:extensions][:osm][:repository] = "https://github.com/systopia/de.systopia.osm.git"
@@ -31,3 +31,7 @@ default[:civicrm][:extensions][:username][:revision] = "master"
 default[:civicrm][:extensions][:donotsendreportemail][:name] = "org.civicrm.donotsendreportemail"
 default[:civicrm][:extensions][:donotsendreportemail][:repository] = "https://github.com/pradpnayak/org.civicrm.donotsendreportemail.git"
 default[:civicrm][:extensions][:donotsendreportemail][:revision] = "3b31c2e0c62183872c7ecd244395fb8dcfbd5dbb"
+
+default[:civicrm][:extensions][:shoreditch][:name] = "org.civicrm.shoreditch"
+default[:civicrm][:extensions][:shoreditch][:repository] = "https://github.com/civicrm/org.civicrm.shoreditch.git"
+default[:civicrm][:extensions][:shoreditch][:revision] = "1.0.0-beta.1"

diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb
index c0542a63586018ea6bdb2648a649ad6ceccaad82..a8881fc0d898773faf33a35af7216a4e5eab2ed5 100644 (file)
--- a/cookbooks/civicrm/recipes/default.rb
+++ b/cookbooks/civicrm/recipes/default.rb
@@ -71,6 +71,10 @@ wordpress_plugin "contact-form-7" do
   site "join.osmfoundation.org"
 end
 
+wordpress_plugin "civicrm-admin-utilities" do
+  site "join.osmfoundation.org"
+end
+
 civicrm_version = node[:civicrm][:version]
 civicrm_directory = "/srv/join.osmfoundation.org/wp-content/plugins/civicrm"
 

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index eba2208f5cf4f631ccd59fd13eada9b9ca9f55fb..8eed59556e415b854d03e7dcc8d3d77079e1d6cb 100644 (file)
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -428,7 +428,6 @@ template "/etc/shorewall/policy" do
 end
 
 template "/etc/shorewall/rules" do
-  action :nothing
   source "shorewall-rules.erb"
   owner "root"
   group "root"
@@ -437,11 +436,6 @@ template "/etc/shorewall/rules" do
   notifies :restart, "service[shorewall]"
 end
 
-notify_group "shorewall-rules" do
-  action :run
-  notifies :create, "template[/etc/shorewall/rules]"
-end
-
 if node[:networking][:firewall][:enabled]
   service "shorewall" do
     action [:enable, :start]
@@ -571,7 +565,6 @@ unless node.interfaces(:family => :inet6).empty?
   end
 
   template "/etc/shorewall6/rules" do
-    action :nothing
     source "shorewall-rules.erb"
     owner "root"
     group "root"
@@ -580,11 +573,6 @@ unless node.interfaces(:family => :inet6).empty?
     notifies :restart, "service[shorewall6]"
   end
 
-  notify_group "shorewall6-rules" do
-    action :run
-    notifies :create, "template[/etc/shorewall6/rules]"
-  end
-
   if node[:networking][:firewall][:enabled]
     service "shorewall6" do
       action [:enable, :start]

diff --git a/cookbooks/networking/resources/firewall_rule.rb b/cookbooks/networking/resources/firewall_rule.rb
index 7cac9f86e4c94ffccdc7a05b42fae8103acfb93e..e92681ec7601fc08364a6e3fd66f96459f47aed8 100644 (file)
--- a/cookbooks/networking/resources/firewall_rule.rb
+++ b/cookbooks/networking/resources/firewall_rule.rb
@@ -33,6 +33,8 @@ property :rate_limit, :kind_of => String, :default => "-"
 property :connection_limit, :kind_of => [String, Integer], :default => "-"
 property :helper, :kind_of => String, :default => "-"
 
+property :compile_time, TrueClass, :default => true
+
 action :accept do
   add_rule :accept
 end

diff --git a/cookbooks/planet/recipes/replication.rb b/cookbooks/planet/recipes/replication.rb
index 51f0e69a216baa5684c78cb237c6fbb692413232..2a3e65cb2127dc5389ce3d78fee85168b389cd1b 100644 (file)
--- a/cookbooks/planet/recipes/replication.rb
+++ b/cookbooks/planet/recipes/replication.rb
@@ -220,6 +220,7 @@ systemd_timer "replication-minutely" do
   description "Minutely replication"
   on_boot_sec 60
   on_unit_active_sec 60
+  accuracy_sec 5
 end
 
 template "/etc/replication/changesets.conf" do

diff --git a/cookbooks/planet/templates/default/replicate-minute.erb b/cookbooks/planet/templates/default/replicate-minute.erb
index 79c394bd01f5a55f4e21e065145ba2aaa915c7bf..a4a07e2f0417b8990c7e8c874e1faf4ea0cf2c3c 100644 (file)
--- a/cookbooks/planet/templates/default/replicate-minute.erb
+++ b/cookbooks/planet/templates/default/replicate-minute.erb
@@ -7,4 +7,4 @@ cd /etc/replication
 osmdbt-catchup --quiet
 osmdbt-get-log --quiet
 osmdbt-catchup --quiet
-osmdbt-create-diff --quiet
+osmdbt-create-diff --quiet --max-changes=50000

diff --git a/roles/kokosnuss.rb b/roles/kokosnuss.rb
new file mode 100644 (file)
index 0000000..cebe596
--- /dev/null
+++ b/roles/kokosnuss.rb
@@ -0,0 +1,41 @@
+name "kokosnuss"
+description "Master role applied to kokosnuss"
+
+default_attributes(
+  :hardware => {
+    :shm_size => "12g"
+  },
+  :networking => {
+    :interfaces => {
+      :external_ipv4 => {
+        :interface => "venet0",
+        :role => :external,
+        :family => :inet,
+        :address => "85.214.255.86",
+        :prefix => "32",
+        :gateway => "85.214.255.86"
+      }
+    },
+    :wireguard => {
+      :enabled => false
+    }
+  },
+  :squid => {
+    :version => 4,
+    :cache_mem => "8192 MB",
+    :cache_dir => [
+      "rock /store/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996",
+      "rock /store/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
+      "rock /store/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
+      "rock /store/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
+    ]
+  },
+  :tilecache => {
+    :tile_parent => "germany.render.openstreetmap.org"
+  }
+)
+
+run_list(
+  "role[strato]",
+  "role[tilecache]"
+)

diff --git a/roles/strato.rb b/roles/strato.rb
new file mode 100644 (file)
index 0000000..5cf4445
--- /dev/null
+++ b/roles/strato.rb
@@ -0,0 +1,20 @@
+name "strato"
+description "Role applied to all servers at Strato"
+
+default_attributes(
+  :hosted_by => "Strato",
+  :location => "Germany"
+)
+
+override_attributes(
+  :networking => {
+    :nameservers => ["85.214.7.22", "81.169.163.106"]
+  },
+  :ntp => {
+    :servers => ["0.de.pool.ntp.org", "1.de.pool.ntp.org", "europe.pool.ntp.org"]
+  }
+)
+
+run_list(
+  "role[de]"
+)