From d32363eea94e017ecfdc6f9f009889eee8cfbc28 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Fri, 11 Oct 2013 11:35:38 +0200 Subject: [PATCH] some more general cleanups --- root/etc/e-smith/db/configuration/defaults/phplist/BouncesPassword | 0 root/etc/e-smith/db/configuration/defaults/phplist/type | 1 + root/etc/e-smith/templates/etc/e-smith/sql/init/phplistdb | 2 -- .../templates/etc/httpd/conf/httpd.conf/{87PHPListAlias => 98phplist} | 0 4 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 root/etc/e-smith/db/configuration/defaults/phplist/BouncesPassword create mode 100644 root/etc/e-smith/db/configuration/defaults/phplist/type rename root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/{87PHPListAlias => 98phplist} (100%) diff --git a/root/etc/e-smith/db/configuration/defaults/phplist/BouncesPassword b/root/etc/e-smith/db/configuration/defaults/phplist/BouncesPassword deleted file mode 100644 index e69de29..0000000 diff --git a/root/etc/e-smith/db/configuration/defaults/phplist/type b/root/etc/e-smith/db/configuration/defaults/phplist/type new file mode 100644 index 0000000..1b93c9e --- /dev/null +++ b/root/etc/e-smith/db/configuration/defaults/phplist/type @@ -0,0 +1 @@ +webapp diff --git a/root/etc/e-smith/templates/etc/e-smith/sql/init/phplistdb b/root/etc/e-smith/templates/etc/e-smith/sql/init/phplistdb index 0ff72b7..46499f9 100644 --- a/root/etc/e-smith/templates/etc/e-smith/sql/init/phplistdb +++ b/root/etc/e-smith/templates/etc/e-smith/sql/init/phplistdb @@ -3,8 +3,6 @@ my $db = ${'phplist'}{'DbName'} || 'phplistdb'; my $user = ${'phplist'}{'DbUser'} || 'phplistuser'; my $pass = ${'phplist'}{'DbPassword'} || 'secret'; - - $OUT .= <<"END"; #! /bin/sh diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/87PHPListAlias b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98phplist similarity index 100% rename from root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/87PHPListAlias rename to root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98phplist