Kouhei Sutou
null+****@clear*****
Tue Jan 31 22:51:37 JST 2017
Kouhei Sutou 2017-01-31 22:51:37 +0900 (Tue, 31 Jan 2017) New Revision: 9d4691a308d4ade60bd34326ee5616ebb36a459d https://github.com/milter-manager/milter-manager/commit/9d4691a308d4ade60bd34326ee5616ebb36a459d Message: Pretty print Modified files: data/defaults/debian.conf data/defaults/freebsd.conf data/defaults/pkgsrc.conf data/defaults/redhat.conf Modified: data/defaults/debian.conf (+32 -13) =================================================================== --- data/defaults/debian.conf 2017-01-31 15:25:47 +0900 (1bd5cdd) +++ data/defaults/debian.conf 2017-01-31 22:51:37 +0900 (3d8dc63) @@ -3,19 +3,38 @@ security.privilege_mode = true candidates = [ - ["milter-greylist", - ["Sendmail Compatible", "Stress Notify", "Trust", - "Remote Network", "S25R", "Unauthenticated"] - ], - ["spfmilter", - ["Remote Network", "Unauthenticated", "No Stress"]], - ["clamav-milter", []], - ["dkim-filter", []], - ["opendkim", []], - ["spamass-milter", - ["Remote Network", "Unauthenticated", "No Stress"]], - ["amavisd-new-milter", []], - ] + [ + "milter-greylist", + [ + "Sendmail Compatible", + "Stress Notify", + "Trust", + "Remote Network", + "S25R", + "Unauthenticated", + ] + ], + [ + "spfmilter", + [ + "Remote Network", + "Unauthenticated", + "No Stress", + ], + ], + ["clamav-milter", []], + ["dkim-filter", []], + ["opendkim", []], + [ + "spamass-milter", + [ + "Remote Network", + "Unauthenticated", + "No Stress", + ], + ], + ["amavisd-new-milter", []], +] candidates.each do |candidate, conditions| detector = DebianInitDetector.new(configuration, candidate) detector.detect Modified: data/defaults/freebsd.conf (+49 -18) =================================================================== --- data/defaults/freebsd.conf 2017-01-31 15:25:47 +0900 (aa139b3) +++ data/defaults/freebsd.conf 2017-01-31 22:51:37 +0900 (0afaaf6) @@ -3,24 +3,55 @@ security.privilege_mode = true candidates = [ - ["milter-greylist", - ["Sendmail Compatible", "Stress Notify", "Trust", - "Remote Network", "S25R", "Unauthenticated"] - ], - ["milter-enma", - ["Remote Network", "Unauthenticated", "No Stress"]], - ["milter-sid", - ["Remote Network", "Unauthenticated", "No Stress"]], - ["clamav-milter", []], - ["milter-dkim", []], - ["milter-opendkim", []], - ["spamass-milter", - ["Remote Network", "Unauthenticated", "No Stress"]], - ["amavis-milter", []], - ["rmilter", - ["Remote Network", "S25R", "Unauthenticated", "No Stress"], - ], - ] + [ + "milter-greylist", + [ + "Sendmail Compatible", + "Stress Notify", + "Trust", + "Remote Network", + "S25R", + "Unauthenticated", + ], + ], + [ + "milter-enma", + [ + "Remote Network", + "Unauthenticated", + "No Stress", + ], + ], + [ + "milter-sid", + [ + "Remote Network", + "Unauthenticated", + "No Stress", + ], + ], + ["clamav-milter", []], + ["milter-dkim", []], + ["milter-opendkim", []], + [ + "spamass-milter", + [ + "Remote Network", + "Unauthenticated", + "No Stress", + ], + ], + ["amavis-milter", []], + [ + "rmilter", + [ + "Remote Network", + "S25R", + "Unauthenticated", + "No Stress", + ], + ], +] candidates.each do |candidate, conditions| detector = FreeBSDRCDetector.new(configuration, candidate) detector.detect Modified: data/defaults/pkgsrc.conf (+40 -15) =================================================================== --- data/defaults/pkgsrc.conf 2017-01-31 15:25:47 +0900 (0ce2254) +++ data/defaults/pkgsrc.conf 2017-01-31 22:51:37 +0900 (b8e48c9) @@ -3,21 +3,46 @@ security.privilege_mode = true candidates = [ - ["milter-greylist", - ["Sendmail Compatible", "Stress Notify", "Trust", - "Remote Network", "S25R", "Unauthenticated"] - ], - ["mimedefang", []], - ["enma", - ["Remote Network", "Unauthenticated", "No Stress"]], - ["dk-milter", []], - ["dkim-filter", []], - ["spamass-milter", - ["Remote Network", "Unauthenticated", "No Stress"]], - ["amavismilter", []], - ["milter-regex", - ["Remote Network", "Unauthenticated", "No Stress"]], - ] + [ + "milter-greylist", + [ + "Sendmail Compatible", + "Stress Notify", + "Trust", + "Remote Network", + "S25R", + "Unauthenticated", + ], + ], + ["mimedefang", []], + [ + "enma", + [ + "Remote Network", + "Unauthenticated", + "No Stress", + ], + ], + ["dk-milter", []], + ["dkim-filter", []], + [ + "spamass-milter", + [ + "Remote Network", + "Unauthenticated", + "No Stress", + ], + ], + ["amavismilter", []], + [ + "milter-regex", + [ + "Remote Network", + "Unauthenticated", + "No Stress", + ], + ], +] candidates.each do |candidate, conditions, spec_detector| detector = PkgsrcRCDetector.new(configuration, candidate, &spec_detector) detector.detect Modified: data/defaults/redhat.conf (+40 -15) =================================================================== --- data/defaults/redhat.conf 2017-01-31 15:25:47 +0900 (516db67) +++ data/defaults/redhat.conf 2017-01-31 22:51:37 +0900 (03b8787) @@ -3,21 +3,46 @@ security.privilege_mode = true candidates = [ - ["milter-greylist", - ["Sendmail Compatible", "Stress Notify", "Trust", - "Remote Network", "S25R", "Unauthenticated"] - ], - ["clamav-milter", []], - ["enma", - ["Remote Network", "Unauthenticated", "No Stress"]], - ["spamass-milter", - ["Remote Network", "Unauthenticated", "No Stress"]], - ["amavisd", []], - ["opendkim", []], - ["rmilter", - ["Remote Network", "S25R", "Unauthenticated", "No Stress"], - ], - ] + [ + "milter-greylist", + [ + "Sendmail Compatible", + "Stress Notify", + "Trust", + "Remote Network", + "S25R", + "Unauthenticated", + ], + ], + ["clamav-milter", []], + [ + "enma", + [ + "Remote Network", + "Unauthenticated", + "No Stress", + ], + ], + [ + "spamass-milter", + [ + "Remote Network", + "Unauthenticated", + "No Stress", + ], + ], + ["amavisd", []], + ["opendkim", []], + [ + "rmilter", + [ + "Remote Network", + "S25R", + "Unauthenticated", + "No Stress", + ], + ], +] candidates.each do |candidate, conditions, spec_detector| detector = RedHatDetector.new(configuration, candidate, &spec_detector) detector.detect -------------- next part -------------- An HTML attachment was scrubbed...下載
