Thank you very much. I merged this one with a small number of additional fixes.

I also created so bug reports about minor bugs which is mainly UI related and is not a deal-breaker for this release, but I think should generally be resolved.

A testing release should be available shortly, so that a larger number of testers can join testing Guardian.

Best, -Michael

On Mon, 2016-08-01 at 20:53 +0200, Stefan Schantl wrote:

Hello,

this is the merge request to include guardian 2.0 into IPFire 2.x.

All changes are stored at the "guardian-2.0" branch in my personal IPFire-2.x repository.

http://git.ipfire.org/?p=people/stevee/ipfire-2.x.git;a=shortlog;h=refs /heads/guardian-2.0

A short summary of the containing changes:

• Update guardian to the newly developed "guardian 2.0".

  • Add backup file for this service.
  • Add logrotate file.
  • Add initscript.
  • Remove old guardian code.

• Add "guardian.cgi" to administrate guardian.

• Remove guardian related code from "ids.cgi" and "snort" initscript.

(shipped by the core update)

• Add required language strings to the english and german language

files. (core update)

Please have a look at my changes and if everything is okay merge them into the next branch to get them released / shipped by the next core update (core 104).

Thanks in advance,

-Stefan