From c557f8f31733463c2bfb818e66cecd263fcbf1cb Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Wed, 11 Apr 2012 13:23:54 +0200 Subject: [PATCH] Current state --- .etckeeper | 10 +- ImageMagick/delegates.xml | 4 +- ImageMagick/policy.xml | 7 +- ImageMagick/type-ghostscript.xml | 68 +++++------ config-archive/etc/ImageMagick/delegates.xml | 112 ++++++++++++++++++ .../etc/ImageMagick/delegates.xml.dist | 0 config-archive/etc/ImageMagick/policy.xml | 57 +++++++++ .../etc/ImageMagick/policy.xml.dist | 0 .../etc/ImageMagick/type-ghostscript.xml | 54 +++++++++ .../etc/ImageMagick/type-ghostscript.xml.dist | 0 10 files changed, 270 insertions(+), 42 deletions(-) create mode 100644 config-archive/etc/ImageMagick/delegates.xml rename ImageMagick/._cfg0000_delegates.xml => config-archive/etc/ImageMagick/delegates.xml.dist (100%) create mode 100644 config-archive/etc/ImageMagick/policy.xml rename ImageMagick/._cfg0000_policy.xml => config-archive/etc/ImageMagick/policy.xml.dist (100%) create mode 100644 config-archive/etc/ImageMagick/type-ghostscript.xml rename ImageMagick/._cfg0000_type-ghostscript.xml => config-archive/etc/ImageMagick/type-ghostscript.xml.dist (100%) diff --git a/.etckeeper b/.etckeeper index 6450cca..fe600c7 100755 --- a/.etckeeper +++ b/.etckeeper @@ -47,9 +47,6 @@ maybe chmod 0755 './ConsoleKit/seats.d' maybe chmod 0644 './ConsoleKit/seats.d/00-primary.seat' maybe chmod 0644 './DIR_COLORS' maybe chmod 0755 './ImageMagick' -maybe chmod 0644 './ImageMagick/._cfg0000_delegates.xml' -maybe chmod 0644 './ImageMagick/._cfg0000_policy.xml' -maybe chmod 0644 './ImageMagick/._cfg0000_type-ghostscript.xml' maybe chmod 0644 './ImageMagick/coder.xml' maybe chmod 0644 './ImageMagick/colors.xml' maybe chmod 0644 './ImageMagick/delegates.xml' @@ -291,6 +288,13 @@ maybe chmod 0644 './conf.d/xdm' maybe chmod 0644 './conf.d/xinetd' maybe chmod 0700 './config-archive' maybe chmod 0755 './config-archive/etc' +maybe chmod 0755 './config-archive/etc/ImageMagick' +maybe chmod 0644 './config-archive/etc/ImageMagick/delegates.xml' +maybe chmod 0644 './config-archive/etc/ImageMagick/delegates.xml.dist' +maybe chmod 0644 './config-archive/etc/ImageMagick/policy.xml' +maybe chmod 0644 './config-archive/etc/ImageMagick/policy.xml.dist' +maybe chmod 0644 './config-archive/etc/ImageMagick/type-ghostscript.xml' +maybe chmod 0644 './config-archive/etc/ImageMagick/type-ghostscript.xml.dist' maybe chmod 0755 './config-archive/etc/apache2' maybe chmod 0755 './config-archive/etc/apache2/modules.d' maybe chmod 0644 './config-archive/etc/apache2/modules.d/00_apache_manual.conf' diff --git a/ImageMagick/delegates.xml b/ImageMagick/delegates.xml index 3870f06..a21e0e7 100644 --- a/ImageMagick/delegates.xml +++ b/ImageMagick/delegates.xml @@ -66,7 +66,7 @@ - + @@ -102,7 +102,7 @@ - + diff --git a/ImageMagick/policy.xml b/ImageMagick/policy.xml index 19e9796..3be0a4b 100644 --- a/ImageMagick/policy.xml +++ b/ImageMagick/policy.xml @@ -39,9 +39,10 @@ - Note, resource policies are maximums for each instance of ImageMagick (e.g. - policy memory limit 1GB, -limit 2GB exceeds policy maximum so memory limit - is 1GB). + Define arguments for the memory, map, area, and disk resources with + SI prefixes (.e.g 100MB). In addition, resource policies are maximums for + each instance of ImageMagick (e.g. policy memory limit 1GB, -limit 2GB + exceeds policy maximum so memory limit is 1GB). --> diff --git a/ImageMagick/type-ghostscript.xml b/ImageMagick/type-ghostscript.xml index 30182b8..213cb31 100644 --- a/ImageMagick/type-ghostscript.xml +++ b/ImageMagick/type-ghostscript.xml @@ -17,38 +17,38 @@ ]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config-archive/etc/ImageMagick/delegates.xml b/config-archive/etc/ImageMagick/delegates.xml new file mode 100644 index 0000000..3870f06 --- /dev/null +++ b/config-archive/etc/ImageMagick/delegates.xml @@ -0,0 +1,112 @@ + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ImageMagick/._cfg0000_delegates.xml b/config-archive/etc/ImageMagick/delegates.xml.dist similarity index 100% rename from ImageMagick/._cfg0000_delegates.xml rename to config-archive/etc/ImageMagick/delegates.xml.dist diff --git a/config-archive/etc/ImageMagick/policy.xml b/config-archive/etc/ImageMagick/policy.xml new file mode 100644 index 0000000..19e9796 --- /dev/null +++ b/config-archive/etc/ImageMagick/policy.xml @@ -0,0 +1,57 @@ + + + + + + + + +]> + + + + + + + + + + + + + diff --git a/ImageMagick/._cfg0000_policy.xml b/config-archive/etc/ImageMagick/policy.xml.dist similarity index 100% rename from ImageMagick/._cfg0000_policy.xml rename to config-archive/etc/ImageMagick/policy.xml.dist diff --git a/config-archive/etc/ImageMagick/type-ghostscript.xml b/config-archive/etc/ImageMagick/type-ghostscript.xml new file mode 100644 index 0000000..30182b8 --- /dev/null +++ b/config-archive/etc/ImageMagick/type-ghostscript.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ImageMagick/._cfg0000_type-ghostscript.xml b/config-archive/etc/ImageMagick/type-ghostscript.xml.dist similarity index 100% rename from ImageMagick/._cfg0000_type-ghostscript.xml rename to config-archive/etc/ImageMagick/type-ghostscript.xml.dist -- 2.39.5