From: Tom Hughes Date: Fri, 24 Mar 2023 16:50:55 +0000 (+0000) Subject: Drop incron support X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/ec3feb22735b9d721f5e1f1e95c4857838a7e710 Drop incron support --- diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml index 1d3f1afb4..7159b11de 100644 --- a/.github/workflows/test-kitchen.yml +++ b/.github/workflows/test-kitchen.yml @@ -53,7 +53,6 @@ jobs: - gps-tile - hardware - hot - - incron - irc - kibana - letsencrypt diff --git a/.kitchen.yml b/.kitchen.yml index fae5dcfcc..9b18826f2 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -185,9 +185,6 @@ suites: - name: hot run_list: - recipe[hot::default] - - name: incron - run_list: - - recipe[incron::default] - name: irc run_list: - recipe[irc::default] diff --git a/cookbooks/incron/README.md b/cookbooks/incron/README.md deleted file mode 100644 index 095b00679..000000000 --- a/cookbooks/incron/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# incron Cookbook - -This cookbook installs incron, an inotify-based cron. diff --git a/cookbooks/incron/attributes/default.rb b/cookbooks/incron/attributes/default.rb deleted file mode 100644 index 4d2ce58b6..000000000 --- a/cookbooks/incron/attributes/default.rb +++ /dev/null @@ -1 +0,0 @@ -default[:incron] = {} diff --git a/cookbooks/incron/metadata.rb b/cookbooks/incron/metadata.rb deleted file mode 100644 index b2ab67863..000000000 --- a/cookbooks/incron/metadata.rb +++ /dev/null @@ -1,8 +0,0 @@ -name "incron" -maintainer "OpenStreetMap Administrators" -maintainer_email "admins@openstreetmap.org" -license "Apache-2.0" -description "Configures incron" - -version "1.0.0" -supports "ubuntu" diff --git a/cookbooks/incron/recipes/default.rb b/cookbooks/incron/recipes/default.rb deleted file mode 100644 index 4c785d15e..000000000 --- a/cookbooks/incron/recipes/default.rb +++ /dev/null @@ -1,54 +0,0 @@ -# -# Cookbook:: incron -# Recipe:: default -# -# 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 -# -# https://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. -# - -package "incron" - -service "incron" do - action [:enable, :start] - supports :status => true, :reload => true, :restart => true -end - -incrontabs = {} - -node[:incron].each_value do |details| - user = details[:user] - path = details[:path] - mask = details[:events].join(",") - command = details[:command] - - incrontabs[user] ||= [] - - incrontabs[user].push("#{path} #{mask} #{command}") -end - -incrontabs.each do |user, lines| - file "/var/spool/incron/#{user}" do - owner user - group "incron" - mode "600" - content lines.join("\n") - end -end - -file "/etc/incron.allow" do - owner "root" - group "incron" - mode "0640" - content incrontabs.keys.sort.join("\n") -end diff --git a/test/integration/incron/serverspec/incron_spec.rb b/test/integration/incron/serverspec/incron_spec.rb deleted file mode 100644 index 8f514be37..000000000 --- a/test/integration/incron/serverspec/incron_spec.rb +++ /dev/null @@ -1,13 +0,0 @@ -require "serverspec" - -# Required by serverspec -set :backend, :exec - -describe package("incron") do - it { should be_installed } -end - -describe service("incron") do - it { should be_enabled } - it { should be_running } -end