Kenji Okimoto
null+****@clear*****
Tue Jun 27 15:49:53 JST 2017
Kenji Okimoto 2017-06-27 15:49:53 +0900 (Tue, 27 Jun 2017) New Revision: 748bfb3116983eddb50d97feceb06dc01fa681b4 https://github.com/milter-manager/milter-manager/commit/748bfb3116983eddb50d97feceb06dc01fa681b4 Message: binding ruby: Organize script name Because rspamd_proxy process is forked from rspamd main process. So `script_name` should be "rspamd". Modified files: binding/ruby/lib/milter/manager/freebsd-rc-detector.rb binding/ruby/lib/milter/manager/redhat-init-detector.rb binding/ruby/lib/milter/manager/systemd-detector.rb data/defaults/debian.conf data/defaults/freebsd.conf data/defaults/redhat.conf Modified: binding/ruby/lib/milter/manager/freebsd-rc-detector.rb (+3 -3) =================================================================== --- binding/ruby/lib/milter/manager/freebsd-rc-detector.rb 2017-06-27 15:24:37 +0900 (b5cc23b) +++ binding/ruby/lib/milter/manager/freebsd-rc-detector.rb 2017-06-27 15:49:53 +0900 (86371cd) @@ -63,8 +63,8 @@ module Milter::Manager @script_name == "rmilter" or @name == "rmilter" end - def rspamd_proxy? - @script_name == "rspamd_proxy" or @name == "rspamd_proxy" + def rspamd? + @script_name == "rspamd" or @name == "rspamd" end private @@ -112,7 +112,7 @@ module Milter::Manager spec ||= detect_clamav_milter_connection_spec if clamav_milter? spec ||= detect_opendkim_connection_spec if opendkim? spec ||= detect_rmilter_connection_spec if rmilter? - spec ||= detect_rspamd_proxy_connection_spec if rspamd_proxy? + spec ||= detect_rspamd_proxy_connection_spec if rspamd? spec end end Modified: binding/ruby/lib/milter/manager/redhat-init-detector.rb (+3 -3) =================================================================== --- binding/ruby/lib/milter/manager/redhat-init-detector.rb 2017-06-27 15:24:37 +0900 (31fed3b) +++ binding/ruby/lib/milter/manager/redhat-init-detector.rb 2017-06-27 15:49:53 +0900 (c97b958) @@ -73,8 +73,8 @@ module Milter::Manager etc_file("rmilter", "rmilter.conf.sysvinit") end - def rspamd_proxy? - @script_name == "rspamd_proxy" + def rspamd? + @script_name == "rspamd" end private @@ -174,7 +174,7 @@ module Milter::Manager end spec ||= detect_opendkim_connection_spec if opendkim? spec ||= detect_rmilter_connection_spec if rmilter? - spec ||= detect_rspamd_proxy_connection_spec if rspamd_proxy? + spec ||= detect_rspamd_proxy_connection_spec if rspamd? spec end Modified: binding/ruby/lib/milter/manager/systemd-detector.rb (+3 -3) =================================================================== --- binding/ruby/lib/milter/manager/systemd-detector.rb 2017-06-27 15:24:37 +0900 (6b0ca75) +++ binding/ruby/lib/milter/manager/systemd-detector.rb 2017-06-27 15:49:53 +0900 (6513d49) @@ -45,8 +45,8 @@ module Milter::Manager @script_name == "rmilter" end - def rspamd_proxy? - @script_name == "rspamd_proxy" + def rspamd? + @script_name == "rspamd" end private @@ -107,7 +107,7 @@ module Milter::Manager spec ||= detect_milter_greylist_connection_spec if milter_greylist? spec ||= detect_opendkim_connection_spec if opendkim? spec ||= detect_rmilter_connection_spec if rmilter? - spec ||= detect_rspamd_proxy_connection_spec if rspamd_proxy? + spec ||= detect_rspamd_proxy_connection_spec if rspamd? spec end Modified: data/defaults/debian.conf (+1 -1) =================================================================== --- data/defaults/debian.conf 2017-06-27 15:24:37 +0900 (ba8826f) +++ data/defaults/debian.conf 2017-06-27 15:49:53 +0900 (dfa417d) @@ -43,7 +43,7 @@ candidates = [ ], ], [ - "rspamd_proxy", + "rspamd", [ "Remote Network", "Unauthenticated", Modified: data/defaults/freebsd.conf (+1 -1) =================================================================== --- data/defaults/freebsd.conf 2017-06-27 15:24:37 +0900 (14304a2) +++ data/defaults/freebsd.conf 2017-06-27 15:49:53 +0900 (75126fd) @@ -51,7 +51,7 @@ candidates = [ ], ], [ - "rspamd_proxy", + "rspamd", [ "Remote Network", "Unauthenticated", Modified: data/defaults/redhat.conf (+1 -1) =================================================================== --- data/defaults/redhat.conf 2017-06-27 15:24:37 +0900 (92528d2) +++ data/defaults/redhat.conf 2017-06-27 15:49:53 +0900 (f8984fe) @@ -42,7 +42,7 @@ candidates = [ ], ], [ - "rspamd_proxy", + "rspamd", [ "Remote Network", "Unauthenticated", -------------- next part -------------- An HTML attachment was scrubbed...下載
