From c7a611da7ca13218619633cfc6c13f7d45814a4c Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Mon, 3 Sep 2012 10:24:13 +0200
Subject: [PATCH] Corrections des templates

---
 root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/mozillasyncdb  | 1 +
 .../templates/etc/mozilla-sync-server/mozilla-sync-server.conf/000Setup | 1 +
 .../etc/mozilla-sync-server/mozilla-sync-server.conf/030storage         | 2 +-
 .../templates/etc/mozilla-sync-server/mozilla-sync-server.conf/040auth  | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/mozillasyncdb

diff --git a/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/mozillasyncdb b/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/mozillasyncdb
new file mode 100644
index 0000000..940dcf3
--- /dev/null
+++ b/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/mozillasyncdb
@@ -0,0 +1 @@
+PERMS=0750
diff --git a/root/etc/e-smith/templates/etc/mozilla-sync-server/mozilla-sync-server.conf/000Setup b/root/etc/e-smith/templates/etc/mozilla-sync-server/mozilla-sync-server.conf/000Setup
index a2b28de..1054d8d 100644
--- a/root/etc/e-smith/templates/etc/mozilla-sync-server/mozilla-sync-server.conf/000Setup
+++ b/root/etc/e-smith/templates/etc/mozilla-sync-server/mozilla-sync-server.conf/000Setup
@@ -6,5 +6,6 @@ our $pass = ${'mozilla-sync'}{'DbPassword'} || 'secret';
 our $quota = ${'mozilla-sync'}{'UserQuota'} || '102400';
 our $useQuota = ($quota =~ m/^\d+$/) ? 'true':'false';
 
+$OUT .= '';
 
 }
diff --git a/root/etc/e-smith/templates/etc/mozilla-sync-server/mozilla-sync-server.conf/030storage b/root/etc/e-smith/templates/etc/mozilla-sync-server/mozilla-sync-server.conf/030storage
index e4e6f73..f29f853 100644
--- a/root/etc/e-smith/templates/etc/mozilla-sync-server/mozilla-sync-server.conf/030storage
+++ b/root/etc/e-smith/templates/etc/mozilla-sync-server/mozilla-sync-server.conf/030storage
@@ -5,7 +5,7 @@ $OUT .=<<"EOF";
 
 [storage]
 backend = syncstorage.storage.sql.SQLStorage
-sqluri = mysql://$user:$pass@localhost/$db
+sqluri = mysql://$user:$pass\@localhost/$db
 standard_collections = false
 use_quota = $useQuota
 quota_size = $quota
diff --git a/root/etc/e-smith/templates/etc/mozilla-sync-server/mozilla-sync-server.conf/040auth b/root/etc/e-smith/templates/etc/mozilla-sync-server/mozilla-sync-server.conf/040auth
index 379d245..8fdb9e4 100644
--- a/root/etc/e-smith/templates/etc/mozilla-sync-server/mozilla-sync-server.conf/040auth
+++ b/root/etc/e-smith/templates/etc/mozilla-sync-server/mozilla-sync-server.conf/040auth
@@ -4,7 +4,7 @@ $OUT .=<<"EOF";
 
 [auth]
 backend = services.user.sql.SQLUser
-sqluri = mysql://$user:$pass@localhost/$db
+sqluri = mysql://$user:$pass\@localhost/$db
 pool_size = 20
 pool_recycle = 3600
 create_tables = true