From 841d762a7d6b6bfc00f4fb84234922fd14308333 Mon Sep 17 00:00:00 2001
From: Vincent Le Gallic <legallic@crans.org>
Date: Tue, 25 Jun 2013 02:22:27 +0200
Subject: [PATCH] [ejabberd] On rajoute des headers pour le fichier de conf et
 on vire le *$!% de certificat
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ah oui, on pense à préciser que c'est pas des # pour les commentaires dans ejabberd.cfg…
---
 Bundler/ejabberd-services.xml              |  1 -
 Cfg/etc/ejabberd/ssl/jabber.pem/info.xml   |  3 --
 Cfg/etc/ejabberd/ssl/jabber.pem/jabber.pem | 53 ----------------------
 Python/etc/ejabberd/ejabberd.cfg           |  5 +-
 4 files changed, 4 insertions(+), 58 deletions(-)
 delete mode 100644 Cfg/etc/ejabberd/ssl/jabber.pem/info.xml
 delete mode 100644 Cfg/etc/ejabberd/ssl/jabber.pem/jabber.pem

diff --git a/Bundler/ejabberd-services.xml b/Bundler/ejabberd-services.xml
index afe64ab..a1195f7 100644
--- a/Bundler/ejabberd-services.xml
+++ b/Bundler/ejabberd-services.xml
@@ -1,7 +1,6 @@
 <Bundle name="ejabberd-services">
   <Python name="/etc/default/ejabberd"/>
   <Python name="/etc/ejabberd/ejabberd.cfg"/>
-  <Path name="/etc/ejabberd/ssl/jabber.pem"/>
   <Package name="ejabberd"/>
   <Service name="ejabberd"/>
 </Bundle>
diff --git a/Cfg/etc/ejabberd/ssl/jabber.pem/info.xml b/Cfg/etc/ejabberd/ssl/jabber.pem/info.xml
deleted file mode 100644
index 5ca20ac..0000000
--- a/Cfg/etc/ejabberd/ssl/jabber.pem/info.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<FileInfo>
-    <Info owner='ejabberd' group='adm' perms='0640'/>
-</FileInfo>
diff --git a/Cfg/etc/ejabberd/ssl/jabber.pem/jabber.pem b/Cfg/etc/ejabberd/ssl/jabber.pem/jabber.pem
deleted file mode 100644
index 40089b0..0000000
--- a/Cfg/etc/ejabberd/ssl/jabber.pem/jabber.pem
+++ /dev/null
@@ -1,53 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEA9VucttGZE8Vx0xUT4yswpurZEVU1/xT4/3oDL/22piM4JFez
-GXT/UA1RS8Yg46u1rca6IS+UgM8I0by05fAXFvZL/2GAX21ih7X486ZJBnQ4Q5BZ
-Oc7vFzx4C2spzkb70D2IH93STgj6b3hVZWiwchtehmsUdQg2jR6pZVFmCuITL43b
-P0RDIt4wkTxWpEtmlsjMA5dLrvyq4/cVgjWzd9bK8cYNAx4FzU/iRwnhvi61iUDD
-tIvfp4SpMIUQJ8XJ5WEtj1iC0ouUmlKxintB/ooTYvMOZXn6cYCh7Nleh6lwoJIP
-df7WPdMvj3CZM6qAp8SbYWztdpjVHd3BtyX09wIDAQABAoIBAQCmNcVX42z7g8mz
-4Jd0UJHIwVcC8uJ9RkvXZWQ7YngU287wb6iYGjXKmPr1heZJ1MxiSDlWudCz4Yxr
-6JXzHk3F9FtPSVGZU5RnstJO29qkUJ68xlBrZM96wi/gLFxJrLRxQP2x+Ka6zkI4
-uR/Absb4xamnDWryTPoHZzoBtL6Xp3MZiGX+QLFl+XKSj9Xl5MKzk1t7GTiCjAcN
-gi0fvV9XwybhmGS3CFzkHC2TVHAZW680BSuZO+Hl9bK/HOAC9cufiAFttFqrfSVb
-6Wh34CFz3HXIO8WyJT2DdDyTHnX7wP8KDcj3f0PlY4NmIfR5mY6KwL3epepJNKnP
-WArobatBAoGBAP3rAM6uUTZcRvH/+s/qNE5LQWcl6vbh5Zv6l+bItSSO+77oWn1r
-mT5MSP1Y4iPJj829gHlJ1EDoYHeJhoNK/Lq9yFIHCD7TI+W1lEFerF3LmA13j+aq
-SeMZIRxWA/tODnlf7qtNHJG/G+1KAILf+Aox1/WxqDGt7C/Lzonus1s/AoGBAPde
-o/qDlEb6DkfLHM3Nv9vufsvQhaFVJfL4iqUnL4M7ahrXHoh30inODu8sjtLLy/LM
-t7xYRKU3otFID3ZIWc0WpXf5NQYFxaVK1lrCX7uauj38oY7vyFK1/ATGKzTlvxHa
-Ics6/RiHcBkux7JXlVqMzySv0NxDwYxo/6LNcxBJAoGAdbtn9Wzn5O+mSYDqF0s9
-k2vbWGtBZdVZ9BeeJPi83MWbPmpXwr2IIVWXpjh3KibEEZ4jGpm725ijWemfP/Md
-+awTXM076n1VsKWfpyuxeg/zYZMlWstsVOsK6iuLzxLjLS3o6O5pJ77XwQ9F62jT
-hk6UFqyYEujUkVjLXDMcYFsCgYEAiS460ZpWiGXztWy2NIt9coH4Xx7sfGOz/+JF
-QQFSH/y7Atd5X0TTj8tuDMUxD0VlfOh6nEB3EQihil3j9Tx6UHnWmYniFcztppSx
-+vMAFBHiZq3LCnF/Lh8t+5fKLjOamlPVmdbEtO2nBNAkfoqDkQu1dCrsMLqCg1NX
-MPmubcECgYANxW5r4VsdJo3lAC1O+i+XpVvwhxhBG4cmONIuBYNN1uFB5KdWXMGp
-PK/aQhzdxKKJcQIYdiJawE7H1XT72YjMeIWpURPb9oXZ9zVJ+JclwtETuuTntnbB
-Mn3lmS8aUumYgyw4kG/jKB6PqjW1uwjNWREItS/bM5KtlNRb46bDGQ==
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIIEdjCCAl6gAwIBAgIDANbXMA0GCSqGSIb3DQEBBQUAMFQxFDASBgNVBAoTC0NB
-Y2VydCBJbmMuMR4wHAYDVQQLExVodHRwOi8vd3d3LkNBY2VydC5vcmcxHDAaBgNV
-BAMTE0NBY2VydCBDbGFzcyAzIFJvb3QwHhcNMTEwNzAxMDcwNTQyWhcNMTMwNjMw
-MDcwNTQyWjAbMRkwFwYDVQQDExBqYWJiZXIuY3JhbnMub3JnMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA9VucttGZE8Vx0xUT4yswpurZEVU1/xT4/3oD
-L/22piM4JFezGXT/UA1RS8Yg46u1rca6IS+UgM8I0by05fAXFvZL/2GAX21ih7X4
-86ZJBnQ4Q5BZOc7vFzx4C2spzkb70D2IH93STgj6b3hVZWiwchtehmsUdQg2jR6p
-ZVFmCuITL43bP0RDIt4wkTxWpEtmlsjMA5dLrvyq4/cVgjWzd9bK8cYNAx4FzU/i
-Rwnhvi61iUDDtIvfp4SpMIUQJ8XJ5WEtj1iC0ouUmlKxintB/ooTYvMOZXn6cYCh
-7Nleh6lwoJIPdf7WPdMvj3CZM6qAp8SbYWztdpjVHd3BtyX09wIDAQABo4GJMIGG
-MAwGA1UdEwEB/wQCMAAwNAYDVR0lBC0wKwYIKwYBBQUHAwIGCCsGAQUFBwMBBglg
-hkgBhvhCBAEGCisGAQQBgjcKAwMwCwYDVR0PBAQDAgWgMDMGCCsGAQUFBwEBBCcw
-JTAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AuY2FjZXJ0Lm9yZy8wDQYJKoZIhvcN
-AQEFBQADggIBADL1DUbPsuSGilI+JeJk4gWSWN4rljB3EkpTqZ6EoHTsmzxzvcHf
-JLRA7mNREdaDpNcryNR0fqgCjElQLVe1tsm0ldZmdRMLRBkDubS6EdvEOUkwYBBF
-oJTtXZsiUJqhAImMJmBU1uaPQj3MDD97sYhVge+Afi1HjALsyftb7CrEDext26Zn
-OcAOtkFgpdzFWsg54Q/b5R7+qNLRh36Q10Mk566a/ZrGQTN+APpS4mv1o/pY3dLJ
-Eua6alX9tNcD20pGORcOYsLbe2WBrBvY+GG3WbEghRc4KtPuCxj4hvNo+38zMMw7
-7VPW5ZsjXbOTqIsgNnEPFF0J9Sq5T13eW4C1VDhYnqJ/GJiQ4A/lnawMTOsUf5Kf
-XCospFCqHRBt/1sAafasg1NHlte0AvZjIz78NkTi5pCNQKTzAmyoIyuOkKHgY/Qh
-Zzwyk+2JMp1Hv+lsNse8MkkaqIilkNx3gaAV8oJcShhaP69nEhhXdINPONI6K+Cb
-Xym3F9KLIomoExrxaZsWP47wQQR6hiMJK0xrskm4MTGFXgOU08lRNUDPNSNIbPC1
-fcmEHZPaUpJgx5cQ1LbCVem3DHbW8An5SAXAOZy3JzQWCSkVTsp9Sf/wZGyXqEox
-1UZln8fY4Mb7O38pUe501jDKlFBJVWvGJHHLpULjWBjIvTYN0ny85l4E
------END CERTIFICATE-----
diff --git a/Python/etc/ejabberd/ejabberd.cfg b/Python/etc/ejabberd/ejabberd.cfg
index 157716d..a31c4e8 100644
--- a/Python/etc/ejabberd/ejabberd.cfg
+++ b/Python/etc/ejabberd/ejabberd.cfg
@@ -4,9 +4,12 @@ info["owner"] = "ejabberd"
 info["group"] = "ejabberd"
 info["perms"] = 0640
 
+
 include("secrets")
 
-header()
+comment_start = "%%%"
+
+header("Configuration du serveur xmpp du crans")
 
 @%%%
 @%%%     Debian ejabberd configuration file