From 9f57ebd4cf2514f11f65d7578263b5962fbe4bf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonathan=20Demmerl=C3=A9?=
 <32387906+Welmoc@users.noreply.github.com>
Date: Fri, 29 Dec 2017 18:56:27 +0100
Subject: [PATCH 01/30] New style.css based on bootstrap

All the style.css file replaced to look like bootstrap without any dependances.
---
 bureau/admin/styles/style.css | 1283 +++++++++++++++++++++++----------
 1 file changed, 884 insertions(+), 399 deletions(-)

diff --git a/bureau/admin/styles/style.css b/bureau/admin/styles/style.css
index 35dbcbd6..4fce8f71 100644
--- a/bureau/admin/styles/style.css
+++ b/bureau/admin/styles/style.css
@@ -1,47 +1,114 @@
-html, body {
-  margin: 0px;
-  padding: 0px;
+
+:root {
+  --blue: #007bff;
+  --indigo: #6610f2;
+  --purple: #6f42c1;
+  --pink: #e83e8c;
+  --red: #dc3545;
+  --orange: #fd7e14;
+  --yellow: #ffc107;
+  --green: #5cb85c;
+  --teal: #20c997;
+  --cyan: #17a2b8;
+  --white: #fff;
+  --gray: #868e96;
+  --gray-dark: #343a40;
+  --primary: #007bff;
+  --secondary: #868e96;
+  --success: #5cb85c;
+  --info: #17a2b8;
+  --warning: #ffc107;
+  --danger: #dc3545;
+  --light: #f8f9fa;
+  --dark: #343a40;
+  --breakpoint-xs: 0;
+  --breakpoint-sm: 576px;
+  --breakpoint-md: 768px;
+  --breakpoint-lg: 992px;
+  --breakpoint-xl: 1200px;
+  --font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+  --font-family-monospace: "SFMono-Regular", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+}
+
+html {
+  height: 100%;
 }
 
 body {
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: 11px;
+  height: 100%;
+  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+  font-size: 14px;
   color: #000000;
-  background-color: #B2CFE4;
+  background-color: #f8f8f8;
+  margin:0px;
+
 }
 
 body.light {
-  background-color: #F0F0F4;
+  background-color: #fff;
 }
 
 .hlp {
   font-family: Helvetica, Tahoma, sans-serif;
-  font-size: 11px;
+  font-size: 14px;
   color: #202020;
 }
 
 table {
-  border-collapse: collapse;
+  border: 1px solid #ddd;
+  border-radius: 5px;
+}
+
+.lst2 {
+  /*background-color: #F1F8FD;*/
+  background-color: none;
+}
+.lst1 {
+  background-color: #f9f9f9;
+}
+
+.lst:nth-child(even) {
+  background:#f9f9f9;
+}
+
+.lst:nth-child(odd) {
+  background:none;
+}
+
+thead tr th:hover, table.tlist tbody tr:first-child th:hover {
+  background-color: #f8f8f8 !important;
+}
+
+table.tlist > tbody > tr.lst:hover,
+table.tlist > tbody > tr.lst > td:hover,
+form[action="adm_dodel.php"] > table.tlist > tbody > tr:hover,
+form[action="adm_dodel.php"] > table.tlist > tbody > tr > td:hover {
+  background-color: #DFEEF8 !important;
+}
+
+tr:hover,  td:hover
+{
+  background-color: transparent;
 }
 
 td {
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: 11px;
+  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+  font-size: 14px;
   color: #000000;
   padding-right: 6px;
 }
 
 th {
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: 11px;
+  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+  font-size: 14px;
   color: black;
-  background: #B2CFE4;
+  background: #f8f8f8;
   font-weight: normal;
   text-align: left;
 }
 
 h3 {
-  font-family: Verdana, Arial, Helvetica, sans-serif;
+  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
   font-size: 23px;
   font-weight: normal;
   color: #444;
@@ -52,12 +119,18 @@ h3 {
   word-wrap: break-word;
 }
 
+#content > h3 {
+  padding-bottom: 9px;
+  margin: 20px 0 20px 15px;
+  border-bottom: 1px solid #eee;
+}
+
 .trbtn {
   text-align: right;
 }
 
 h4 {
-  font-family: Verdana, Arial, Helvetica, sans-serif;
+  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
   font-size: 16px;
   font-weight: bold;
   color: #007777
@@ -67,204 +140,327 @@ hr {
   /*color: #007799;*/
   height: 1px;
   /*border: 1px solid #007799;*/
-  border: 1px solid #555;
+  border: 1px solid transparent;
   border-width: 1px 0 0 0;
 }
 
+#content > hr, #content br {
+  display: none;
+}
+
+.block_login_page br, td br, form > br, p.hlp > br {
+  display: contents !important;
+}
+
 a {
   text-decoration: none;
-  color: #0D5689;
+  color: #337ab7;
 }
 
 a:hover {
   text-decoration: underline;
-  color: #000000;
+  color: black;
+  text-decoration: none;
+}
+
+td[style='background: red'], td[style='background: green'], td[style='background: yellow'], td[style='background: orange'] {
+  border-radius: 1000px;
+  display: block;
+  vertical-align: middle;
+  width: 10px;
+  height: 10px;
+}
+
+th:hover {
+  background-color: #DFEEF8;
+}
+
+td[style='padding-right: 2px; border-right: 1px solid black; '], td[style='padding-right: 2px; border-right: 1px solid black; color: red'] {
+  border-right: 1px solid #ddd !important;
+}
+
+.trbtn:hover {
+  background-color: transparent !important;
 }
 
 fieldset {
-  border: 1px solid #555;
+  border: 1px solid transparent;
 }
 
 pre {
   overflow: auto;
-  background-color: #ddd;
-  padding: 10px;
-  border: solid 1px #999;
+  background-color: #eee;
+  border: 1px solid transparent;
   border-radius: 4px;
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
 }
 
-.inp {
-  /* Should not be use anymore !!! */
-  border-color: blue;
-  border-width: 5px;
-  background-color: #500000;
-  color: white;
+div.ui-accordion-content > ul {
+  margin-top: 0px !important;
 }
 
 .inc, .inl {
-  border: 1px solid black;
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: 10px;
-  border-style: none;
+  border: 1px solid #999;
+  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+  font-size: 13px;
   color: black;
   background: white;
 }
 
-.inb {
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;  
-  border: 1px solid #999;
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: 11px;
-  padding: 4px 6px;
-  color: black;
-  background-color: #CFE3F1;
-  cursor: pointer;
-  margin-right: 4px;
-  height: 25px;
-  vertical-align: middle;
-}
-.inb:hover {
-  background-color: #BFD3E1;
-}
-.ina a, .ina a:hover, .inb a, .inb a:hover {
-  color: #000;
-  text-decoration: none;
-  vertical-align: middle;
-  line-height: 15px;
-}
-input.ui-state-hover {
-    font-weight: normal;
+body.light input.inb, input.ina{
+  margin-top: 10px;
 }
 
-span.inb {
-  display: inline-block;
-  height: 15px;
-  padding: 4px 6px;
-}
-
-input.ina, input.inav {
-  border: 1px solid #999;
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: 10px;
-  padding: 2px 4px 2px 4px;
-  color: black;
-  cursor: pointer;
-  /*float: right;*/
-}
-
-input.ina:hover, input.ina, input.inav, input.inav:hover {
-  border: 1px solid #999;
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: 10px;
-  color: black;
-  cursor: pointer;
-  /*float: right;*/
-}
-
-input.ina, .ina a {
-  background-color: #F1F8FD;
-}
-input.ina:hover, .ina a:hover,
-input.inav, .inav a {
-  background-color: #CFE3F1;
-}
-input.inav:hover, .inav a:hover, a.inav:hover {
-  background-color: #F1F8FD;
-}
-
-.ina-active a, a.ina-active, input.ina-active {
-  background-color: #C1FFCD;
-}
-
-.ina a, a.ina, .inav a, a.inav {
+input.inb, input.ina{
   color: black;
   white-space: nowrap;
   border: 1px solid #999;
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: 10px;
+  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+  font-size: 14px;
+  padding: 4px 10px 4px 0px;
+  cursor: pointer;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+  vertical-align: middle;
+  padding-left: 10px;
+  height: auto;
+  margin-top: auto;
+}
+
+input.inb:hover, input.ina:hover {
+  border: 1px solid #999;
+  text-decoration: none;
+  background-color: #DFEEF8;
+}
+
+input.inb:focus, input.ina.focus {
+  box-shadow: 0 0 0 0.2rem inbrgba(40, 167, 69, 0.5);
+}
+
+.inb.disabled, .inb:disabled {
+  background-color: #5cb85c;
+  border-color: #5cb85c;
+}
+
+
+.cancel.inb:not([disabled]):not(.disabled):active:, .cancel.inb:not([disabled]):not(.disabled).active,
+.cancel.show > .inb.dropdown-toggle {
+  color: #fff;
+  background-color: #f0ad4e;
+  border-color: #eea236;
+}
+
+input.inb.cancel:active {
+  color: #fff;
+  background-color: #f0ad4e;
+  border-color: #eea236;
+}
+
+.cancel:active{
+  color: #fff;
+  background-color: #f0ad4e;
+  border-color: #eea236;
+}
+
+.delete.inb:not([disabled]):not(.disabled):active, .delete.inb:not([disabled]):not(.disabled).active,
+.delete.show > .inb.dropdown-toggle {
+  color: #fff;
+  background-color: #d9534f;
+  border-color: #d43f3a;
+}
+
+input.inb.delete:active {
+  color: #fff;
+  background-color: #d9534f;
+  border-color: #d43f3a;
+
+}
+
+.ok.inb:not([disabled]):not(.disabled):active, .ok.inb:not([disabled]):not(.disabled).active,
+.ok.show > .inb.dropdown-toggle {
+  color: #fff;
+  background-color: #449d44;
+  border-color: #255625;
+}
+
+input.inb.ok:active {
+  color: #fff;
+  background-color: #449d44;
+  border-color: #255625;
+}
+
+.add.inb:not([disabled]):not(.disabled):active, .add.inb:not([disabled]):not(.disabled).active,
+.add.show > .inb.dropdown-toggle {
+  color: #fff;
+  background-color: #449d44;
+  border-color: #255625;
+}
+
+input.inb.add:active {
+  color: #fff;
+  background-color: #449d44;
+  border-color: #255625;
+}
+
+input.ui-state-hover {
+  font-weight: normal;
+}
+
+input.ina, input.inav,
+input.ina:hover, input.inav:hover {
+  border: 1px solid #999;
+  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+  font-size: 14px;
+  padding: 2px 4px 2px 4px;
+  color: black;
+  cursor: pointer;
+}
+
+input.ina, .ina a, .inb a, input.inb, input.ina,
+input.ina:hover, .ina a:hover, .inb a:hover,
+input.inav, .inav a {
+  background-color: #F8F8F8;
+}
+
+input.inav:hover, .inav a:hover, a.inav:hover,
+input.ina, .ina a  {
+  background-color: #fff;
+}
+/*
+.ina-active a, a.ina-active, input.ina-active {
+background-color: #C1FFCD;
+}*/
+
+.ina a, a.ina, .inb a, a.inb,.inav a, a.inav {
+  color: black;
+  white-space: nowrap;
+  border: 1px solid #999;
+  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+  font-size: 14px;
   padding: 4px 10px;
   color: black;
   cursor: pointer;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;  
-  display: inline-block;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
   vertical-align: middle;
-  line-height: 15px;
-  height: 15px;
-}
-
-.inb a, a.inb {
-  padding: 4px 10px;
-}
-
-input[type=button],
-input[type=submit] {
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;  
+  line-height: 23px;
   height: 25px;
 }
-.ina a:hover, a.ina:hover, .inav a:hover, a.inav:hover {
+
+#emaildom.int, #newsubname.int, #create_dom_list {
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+  padding-bottom: 4px;
+  padding-top: 4px;
+  padding-right: 10px;
+}
+
+#tabsdom-addsub #newsubname.int {
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+  padding-bottom: 5px;
+  padding-top: 3px;
+  padding-right: 10px;
+}
+
+.int#sub, .int#mail_arg {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+  padding-top: 2px;
+}
+
+.ina a:hover, a.ina:hover, .inb a:hover, a.inb:hover,.inav a:hover, a.inav:hover {
   text-decoration: none;
   color: black;
 }
 
-.ina img, .ina img {
+.ina img, .inb img {
   vertical-align: middle;
   padding: 0 2px 0 0;
   float: left;
 }
 .bff {
   border: 1px solid #999;
-  background-color: #F1F8FD;
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: 10px;
+  background-color: #F8F8F8;
+  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+  font-size: 13px;
   padding-left: 2px;
   padding-right: 4px;
   color: black;
   cursor: pointer;
 }
-.int {
-  border: 1px dotted black;
-  background-color: white;
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: 11px;
-  padding: 2px;
+
+form[action='adm_dodefquotas.php'] table {
+  border-color: transparent;
 }
+
+.int {
+  font-size: 14px;
+  line-height: 1.4;
+  color: #555;
+  background-color: #fff;
+  background-image: none;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
+  min-height: 26px;
+}
+
+span.intleft, #usernpfx, #newdomwww {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+  padding-bottom: 4px;
+  padding-top: 3px;
+  padding-right: 10px;
+}
+
+#create_dom_list_pfx {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+  border-right: 0;
+  padding-bottom: 5px;
+  padding-top: 3px;
+  padding-right: 10px;
+  padding-left: 10px;
+  padding-right: 0px;
+}
+
+#usern, #newdomain {
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+
+span.intright {
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+  padding-bottom: 4px;
+  padding-top: 3px;
+  padding-right: 10px;
+}
+
+input.intleft {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
+
+input.intright {
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+
 .intleft {
   border-right: 0px;
   padding-right: 0px;
 }
+
 .intright {
   border-left: 0px;
   padding-left: 0px;
 }
 
-.lst2 {
-  /*background-color: #F1F8FD;*/
-  background-color: #E7F0F9;
-}
-.lst1 {
-  background-color: #CFE3F1;
-}
-
-.lst:nth-child(even) { background:#E7F0F9; }
-.lst:nth-child(odd) { background:#CFE3F1; }
-
-.dlogin {
-  text-align: center;
-}
-
-.login {
-  margin-left: auto;
-  margin-right: auto;
-}
-
 img {
   border: 0px;
   vertical-align: middle;
@@ -272,81 +468,83 @@ img {
 
 /* Alerts */
 .alert {
-    border: 1px solid transparent;
-    border-radius: 4px 4px 4px 4px;
-    margin-bottom: 20px;
-    padding: 15px;
+  border: 1px solid transparent;
+  border-radius: 4px 4px 4px 4px;
+  margin-bottom: 20px;
+  padding: 15px;
 }
 .alert h4 {
-    color: inherit;
-    margin-top: 0;
+  color: inherit;
+  margin-top: 0;
 }
 .alert .alert-link {
-    font-weight: bold;
+  font-weight: bold;
 }
 .alert > p, .alert > ul {
-    margin-bottom: 0;
-    margin-top: 0;
+  margin-bottom: 0;
+  margin-top: 0;
 }
 .alert > p + p {
-    margin-top: 5px;
+  margin-top: 5px;
 }
 .alert-dismissable {
-    padding-right: 35px;
+  padding-right: 35px;
 }
 .alert-dismissable .close {
-    color: inherit;
-    position: relative;
-    right: -21px;
-    top: -2px;
+  color: inherit;
+  position: relative;
+  right: -21px;
+  top: -2px;
 }
 .alert-success {
-    background-color: #DFF0D8;
-    border-color: #D6E9C6;
-    color: #356635;
+  background-color: #DFF0D8;
+  border-color: #D6E9C6;
+  color: #356635;
 }
 .alert-success hr {
-    border-top-color: #C9E2B3;
+  border-top-color: #C9E2B3;
 }
 .alert-success .alert-link,
 .alert-success a{
-    color: #234323;
+  color: #234323;
 }
+
 .alert-info {
-    background-color: #D9EDF7;
-    border-color: #BCE8F1;
-    color: #2D6987;}
+  background-color: #D9EDF7;
+  border-color: #BCE8F1;
+  color: #2D6987;
+}
 .alert-info hr {
-    border-top-color: #A6E1EC;
+  border-top-color: #A6E1EC;
 }
 .alert-info .alert-link,
 .alert-info a
 {
-    color: #193B4D;
+  color: #193B4D;
 }
 .alert-warning {
-    background-color: #FCF8E3;
-    border-color: #FBEED5;
-    color: #A47E3C;
+  background-color: #FCF8E3;
+  border-color: #FBEED5;
+  color: #A47E3C;
 }
 .alert-warning hr {
-    border-top-color: #F8E5BE;
+  border-top-color: #F8E5BE;
 }
 .alert-warning .alert-link,
 .alert-warning a {
-    color: #6C5228;
+  color: #6C5228;
 }
 .alert-danger {
-    background-color: #F2DEDE;
-    border-color: #EED3D7;
-    color: #953B39;
+  background-color: #F2DEDE;
+  border-color: #EED3D7;
+  color: #953B39;
 }
 .alert-danger hr {
-    border-top-color: #E6C1C7;
+  border-top-color: #E6C1C7;
 }
 .alert-danger .alert-link,
 .alert-danger a{
-    color: #6F2B2A;
+  color: #6F2B2A;
 }
 .alert-danger-tr {
   background-color: #F2DEDE !important;
@@ -355,24 +553,23 @@ img {
 
 /* Alert icons */
 #content .alert {
-    background-position: 12px center;
-    background-repeat: no-repeat;
-    padding-left: 48px;
+  background-position: 12px center;
+  background-repeat: no-repeat;
+  padding-left: 48px;
 }
 #content .alert-danger {
-    background-image: url("../images/danger.png");
+  background-image: url("../images/danger.png");
 }
 #content .alert-info{
-    background-image: url("../images/info.png");
+  background-image: url("../images/info.png");
 }
 #content .alert-success {
-    background-image: url("../images/success.png");
+  background-image: url("../images/success.png");
 }
 #content .alert-warning {
-    background-image: url("../images/warning.png");
+  background-image: url("../images/warning.png");
 }
 
-
 .alerte {
   color: #A00;
   font-style: italic;
@@ -398,24 +595,21 @@ img {
   text-align: center;
 }
 
+ul > li > a > span > img {
+  display: none;
+}
+
 #global {
   display: block;
-  margin-left: auto;
-  margin-right: auto;
-  margin-top: 20px;
-  margin-bottom: 20px;
   width: 1020px;
-  border: 1px solid #888;
-  -webkit-border-radius: 10px;
-  -moz-border-radius: 10px;
-  border-radius: 10px;  
-  box-shadow: 1px 1px 15px #555;
-  background-color: #F0F0F4;
+  border: 1px solid #ddd;
+  background-color: #fff;
+  border: 0;
+  min-height: 100%;
 }
 
 @media screen and (min-width: 1000px) {
   #global {
-    margin: 20px 50px;
     width: auto;
     display: flex;
   }
@@ -430,76 +624,102 @@ img {
 
 #menu {
   display: block;
-  border-right: 1px solid #888;
-  padding: 0;
+  border-right: 1px solid #ddd;
+  border-bottom: transparent;
+  padding: 0px;
+
 }
 
 #content {
   display: block;
-  width: 770px;
   float: right;
-  margin-left: 10px;
-  padding-right: 10px;
+  padding: 10px;
   vertical-align: top;
+  background-color: #fff;
+
 }
 
 .clearfix:after {
-	visibility: hidden;
-	display: block;
-	content: "";
-	clear: both;
-	height: 0;
-	}
+  visibility: hidden;
+  display: block;
+  content: "";
+  clear: both;
+}
+
+a[href="ftp_edit.php?create=1"], a[href="httpperm_list.php"] {
+  margin-left: -4px;
+}
+
+form[action="mman_edit.php"] > table > tbody > tr.lst1:hover, form[action="mman_edit.php"] > table > tbody > tr.lst2:hover {
+  background-color: #DFEEF8;
+}
 
 /* Menu */
 
 #menu {
   display: block;
+  background-color: #f8f8f8;
   float: left;
   padding: 0px;
   margin: 0px;
-  width: 200px;
-  padding-right: 10px;
-  padding-bottom: 10px;
-  padding-left: 10px;
-  border-radius: 10px 0 0 10px;
-  -webkit-border-radius: 10px 0 0 10px;
-  -moz-border-radius: 10px 0 0 10px;
+  width: 250px;
+}
+
+.menu-title:active {
+  background-color: #DFEEF8;
+}
+
+#menu-dom:active {
+  background-color: #DFEEF8;
+}
+
+.block_login_page .menu-box {
+  font-size: 14px;
+  background-color: #fff;
+  border: 1px solid #ddd;
+  border-radius: 5px;
+  -webkit-box-shadow: 0 1px 1px rgba(0,0,0,.05);
+  box-shadow: 0 1px 1px rgba(0,0,0,.05);
+}
+
+.menu-box a .menu-title {
+  border-bottom: 1px solid #e7e7e7;
+}
+
+.menu-box li:last-child {
+    border-bottom: 1px solid #e7e7e7;
 }
 
 .menu-box {
-  margin-bottom: 10px;
-  font-size: 11px;
-  background-color: #F4F4FA;
-  border: 1px solid #888;
-  box-shadow: 1px 1px 5px #888;
-  border-radius: 4px 4px 0 0;
-  -webkit-border-radius: 4px 4px 0 0;
-  -moz-border-radius: 4px 4px 0 0;
+  font-size: 14px;
+  background-color: #f8f8f8;
+  border-top-color: transparent;
+  height: auto;
 }
 
 .menu-box .menu-title {
   display: block;
   color: #000000;
-  border-bottom: 2px solid #AAA;
-  background-color: #CFE3F1;
+  background-color: #f8f8f8;
   padding: 3px;
-  -webkit-border-radius: 4px 4px 0 0;
-  -moz-border-radius: 4px 4px 0 0;
-  border-radius: 4px 4px 0 0;
 }
 
 .menu-box a .menu-title {
-  min-height: 16px;
+  min-height: 30px;
+  padding-top: 7px;
 }
 
 .menu-box .menu-conmargin {
   margin: 0 5px 5px 5px;
 }
 
+.menu-content ul li a span {
+  margin-left: 22px;
+}
+
 .menu-box ul {
   margin: 0px;
-  padding: 5px 0 5px 0;
+  padding: 0px;
   list-style-type: none;
 }
 
@@ -508,7 +728,7 @@ img {
 
 .menu-box a {
   text-decoration: none;
-  color: #0D5689;
+  color: #337ab7;
 }
 
 .menu-box a:hover,
@@ -517,15 +737,20 @@ img {
   background-color: #DFEEF8;
 }
 
+.menu-box a:focus,
+.menu-box a:focus .menu-title {
+  text-decoration: none;
+  background-color: #DFEEF8;
+}
+
 .menu-box li a {
   display: block;
   padding: 5px 5px 5px 10px;
-  color: #0D5689;
+  color: #444;
   text-decoration: none;
   border: 1px solid transparent;
   border-width: 1px 0;
-  line-height: 0.75em;
-  height: 10px;
+  height: 25px;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
@@ -545,7 +770,6 @@ img {
 
 .menu-box li a:hover {
   color: #000000;
-  border: 1px solid #C1D8E9;
   border-width: 1px 0;
   text-decoration: none;
   background-color: #DFEEF8;
@@ -580,8 +804,8 @@ img {
 }
 
 table.searchtable {
-  width: 700px; 
-  border: 1px dotted #99f; 
+  width: 700px;
+  border: 1px dotted #99f;
   margin: 20px 0 20px 0px;
 }
 
@@ -594,6 +818,15 @@ table.searchtable td {
   text-align: center;
   margin-left: auto;
   margin-right: auto;
+  bottom: 0;
+}
+/*
+.logout-menu {
+  margin-bottom: 100%;
+}*/
+
+#content > .center {
+    display: none;
 }
 
 .border {
@@ -610,7 +843,7 @@ table.searchtable td {
 }
 
 .breadcrumb {
-  font-size: 12px;
+  font-size: 14px;
 
 }
 
@@ -623,17 +856,11 @@ table.searchtable td {
   padding-left: 0;
 }
 
-#create_dom_list_pfx {
-  border-right: 0;
-  padding: 3px;
-}
 #create_dom_list {
   border-left: 0;
   padding-left: 0;
 }
 
-
-
 input#email {
   border-right: 0;
   padding-right: 0;
@@ -645,26 +872,27 @@ span#emaildom {
   padding-left: 2px;
 }
 
-.tedit { 
-     border: 1px solid #aaa;
-     padding: 6px;
-     margin: 0;
-     border-collapse: collapse;
- }
-.tedit td, .tedit th { 
+.tedit {
+  border: 1px solid #aaa;
+  padding: 6px;
+  margin: 0;
+  border-collapse: collapse;
+  border: 1px solid #ddd;
+  border-radius: 5px;
+}
+.tedit td, .tedit th {
   border: 1px solid #aaa;
   padding: 10px;
-  margin: 0;             
+  margin: 0;
 }
 
-.formcell { 
+.formcell {
   vertical-align: top;
-  border: 1px solid #aaa; 
   padding: 10px;
 }
 
 .tlist, .tlist td, .tlist th,
-.tlist2, .tlist2 td, .tlist2 th { 
+.tlist2, .tlist2 td, .tlist2 th {
   padding: 4px;
   margin: 0;
   border-collapse: collapse;
@@ -672,33 +900,29 @@ span#emaildom {
 
 .tlist {
   width: 100%;
-  border: 1px solid #C1D8E9;
+  border: 1px solid #ddd;
 }
 
-.tlistb, .tlistb td, .tlistb th { 
+.tlistb, .tlistb td, .tlistb th {
   padding: 4px;
   margin: 0;
   border-collapse: collapse;
 }
 
-table.tlistb, .tlistb tr {
-  border: solid 1px #C1D8E9;
-}
-
-.tlist tr:hover, .tlist2 tr:hover {
-  background-color: #F1D5CF;
+table.tlistb, .tlistb tr, form > table {
+  border: 1px solid transparent;
 }
 
 .tlist th, .tlist2 th {
   font-size: 125%;
 }
 
-input#dir, input#sub_local { 
+input#dir, input#sub_local {
   width: 200px;
 }
 
 .tab-ok {
-  background-color: lightgreen;
+  background-color: green;
 }
 .tab-err {
   background-color: red;
@@ -728,17 +952,18 @@ input#dir, input#sub_local {
 }
 
 .retour-auto {
-  max-width:220px; 
+  max-width:220px;
   word-wrap:break-word;
 }
 
 .menutoplogo {
-  margin: 10px 0 0 5px;
+  top : 0;
+  margin: 20px 30px;
   width: 190px;
 }
 
 .currentuser {
-  margin: 5px 5px 10px 5px;
+  margin: 25px 5px 10px 5px;
   color:#444;
 }
 
@@ -753,8 +978,9 @@ input#dir, input#sub_local {
 .menu-quota div.progress-bar {
   width: 180px;
   background: #fff;
-  border: solid 1px #AAA;
+  border: 1px solid transparent;
   margin-left: 10px;
+  display: none;
 }
 
 div.progress-bar {
@@ -762,11 +988,11 @@ div.progress-bar {
   width: 100%;
   height: 20px;
   background-color: #fff;
-  border: solid 1px #aaa;
+  border: 1px solid transparent;
   overflow: hidden;
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
-  border-radius: 4px;  
+  border-radius: 4px;
 }
 
 div.progress-bar div.barre {
@@ -783,12 +1009,11 @@ div.progress-bar div.txt {
   top: 3px;
   left: 0;
   width: 100%;
-  text-align:center; 
+  text-align:center;
 }
 
 .ombrage {
-  border: 1px solid #888;
-  box-shadow: 1px 1px 15px #555;
+  border: 1px solid #ddd;
 }
 
 .petit,
@@ -799,264 +1024,396 @@ div.progress-bar div.txt {
 }
 
 #adm_panel li, #adm_panel_root li {
-    padding: 4px 0 4px 0;
+  padding: 4px 0 4px 0;
 }
 #adm_panel li:hover, #adm_panel_root li:hover {
-  background-color: #BFD3E1;
+  background-color: #DFEEF8;
 }
 
 .edit a, a.edit, input.edit {
   background-image: url(../images/edit.png);
   background-repeat: no-repeat;
-  background-position: 8px 3px;
+  background-position: 8px 8px;
   padding-left: 30px;
 }
 
 .view a, a.view, input.view {
   background-image: url(../images/code.png);
   background-repeat: no-repeat;
-  background-position: 8px 3px;
-  padding-left: 30px;
-}
-
-.delete a, a.delete, input.delete {
-  background-image: url(../icon/delete.png);
-  background-repeat: no-repeat;
-  background-position: 8px 3px;
+  background-position: 8px 8px;
   padding-left: 30px;
 }
 
 .lock a, a.lock, input.lock {
   background-image: url(../icon/encrypted.png);
   background-repeat: no-repeat;
-  background-position: 8px 3px;
+  background-position: 8px 8px;
   padding-left: 30px;
 }
 
 .settings a, a.settings, input.settings {
   background-image: url(../icon/settings.png);
   background-repeat: no-repeat;
-  background-position: 8px 3px;
+  background-position: 8px 8px;
   padding-left: 30px;
 }
 
 .ok a, a.ok, input.ok {
   background-image: url(../icon/ok.png);
   background-repeat: no-repeat;
-  background-position: 8px 3px;
+  background-position: 8px 8px;
   padding-left: 30px;
+  color: #fff;
+  background-color: #5cb85c;
+  border-color: #4cae4c;
+}
+
+input.ok:hover, input.ok:focus {
+  background-image: url(../icon/ok.png);
+  background-repeat: no-repeat;
+  background-position: 8px 8px;
+  padding-left: 30px;
+  color: #fff;
+  background-color: #449d44;
+  border-color: #398439;
+}
+
+input[value="Supprimer les utilisateurs cochés"],
+input[value="Delete the checked users"] {
+  margin-bottom: 10px;
+}
+
+.add a, a.add,
+input.add, span.add .ina {
+  background-image: url(../icon/add.png);
+  background-repeat: no-repeat;
+  background-position: 8px 8px;
+  padding-left: 30px;
+}
+
+div.add > a:hover,
+div > .add a:hover, p > a.add:hover {
+  color: #fff;
+  background-color: #5cb85c;
+  border-color: #4cae4c;
+}
+
+input.add:hover, input.add:focus {
+  background-image: url(../icon/add.png);
+  background-repeat: no-repeat;
+  background-position: 8px 8px;
+  padding-left: 30px;
+  color: #fff;
+  background-color: #449d44;
+  border-color: #398439;
+}
+
+.delete a, a.delete, input.delete {
+  background-image: url(../icon/delete.png);
+  background-repeat: no-repeat;
+  background-position: 8px 8px;
+  padding-left: 30px;
+}
+
+div.delete a:hover,
+div > .delete a:hover, p > a.delete:hover {
+  color: #fff;
+  background-color: #d9534f;
+  border-color: #d43f3a;
+}
+
+input.delete:hover, input.delete:focus {
+  background-image: url(../icon/delete.png);
+  background-repeat: no-repeat;
+  background-position: 8px 8px;
+  padding-left: 30px;
+  color: #fff;
+  background-color: #d9534f;
+  border-color: #d43f3a;
 }
 
 .cancel a, a.cancel, input.cancel {
   background-image: url(../icon/cancel.png);
   background-repeat: no-repeat;
-  background-position: 8px 3px;
+  background-position: 8px 8px;
   padding-left: 30px;
 }
 
-.add a, a.add, input.add {
-  background-image: url(../icon/add.png);
+input.cancel:hover {
+  background-image: url(../icon/cancel.png);
   background-repeat: no-repeat;
-  background-position: 8px 3px;
+  background-position: 8px 8px;
   padding-left: 30px;
+  background-color: #fcf8e3;
+}
+
+input.cancel:active {
+  background-image: url(../icon/cancel.png);
+  background-repeat: no-repeat;
+  background-position: 8px 8px;
+  padding-left: 30px;
+  background-color: #f0ad4e;
+  border-color: #eea236;
+}
+
+.inb[name='cancel']:active {
+  background-color: #f0ad4e;
+  border-color: #eea236;
+}
+.inb[name='cancel']:hover {
+  background-color: #fcf8e3;
+}
+
+.inb[name='select']:active {
+  background-color: #449d44;
+  border-color: #255625;
+}
+.inb[name='select']:hover {
+  background-color: #dff0d8;
 }
 
 .configure a, a.configure, input.configure {
   background-image: url(../icon/configure.png);
   background-repeat: no-repeat;
-  background-position: 8px 3px;
+  background-position: 8px 8px;
   padding-left: 30px;
 }
 
 .edit a, a.edit, input.edit {
   background-image: url(../icon/edit.png);
   background-repeat: no-repeat;
-  background-position: 8px 3px;
+  background-position: 8px 8px;
   padding-left: 30px;
 }
 
 .save a, a.save, input.save {
   background-image: url(../icon/save.png);
   background-repeat: no-repeat;
-  background-position: 8px 3px;
+  background-position: 8px 8px;
   padding-left: 30px;
 }
 
 .down a, a.down, input.down {
   background-image: url(../icon/save.png);
   background-repeat: no-repeat;
-  background-position: 8px 3px;
+  background-position: 8px 8px;
   padding-left: 30px;
 }
 
 .up a, a.up, input.up {
   background-image: url(../icon/up.png);
   background-repeat: no-repeat;
-  background-position: 8px 3px;
+  background-position: 8px 8px;
   padding-left: 30px;
+  padding-top: 5px;
+  padding-bottom: 5px;
+}
+
+.up a:hover, a.up:hover, input.up:hover {
+  background-image: url(../icon/up.png);
+  background-repeat: no-repeat;
+  background-position: 8px 8px;
+  padding-left: 30px;
+  padding-top: 5px;
+  padding-bottom: 5px;
+}
+
+#btb1.ina {
+  padding-top: 5px;
+  padding-bottom: 4px;
 }
 
 .back a, a.back, input.back {
   background-image: url(../icon/back.png);
   background-repeat: no-repeat;
-  background-position: 8px 3px;
+  background-position: 8px 8px;
   padding-left: 30px;
 }
 
 .admin a, a.admin, input.admin, .admin-menu .menu-title {
   background-image: url(../images/admin.png);
   background-repeat: no-repeat;
-  background-position: 8px 3px;
+  background-position: 8px 10px;
   padding-left: 30px;
 }
 
 .home a, a.home, input.home, .home-menu .menu-title {
   background-image: url(../images/home.png);
   background-repeat: no-repeat;
-  background-position: 8px 3px;
+  background-position: 8px 10px;
   padding-left: 30px;
+  margin-top: 10px;
+  border-top: 1px solid #ddd;
 }
 
 .dom a, a.dom, input.dom, .dom-menu .menu-title {
   background-image: url(../images/dom.png);
   background-repeat: no-repeat;
-  background-position: 8px 3px;
+  background-position: 8px 10px;
   padding-left: 30px;
 }
 
 .mail a, a.mail, input.mail, .mail-menu .menu-title {
   background-image: url(../images/mail.png);
   background-repeat: no-repeat;
-  background-position: 8px 3px;
+  background-position: 8px 10px;
   padding-left: 30px;
 }
 
 .bro a, a.bro, input.bro, .bro-menu .menu-title {
   background-image: url(../images/folder.png);
   background-repeat: no-repeat;
-  background-position: 8px 3px;
+  background-position: 8px 10px;
   padding-left: 30px;
 }
 
 .hta a, a.hta, input.hta, .hta-menu .menu-title {
   background-image: url(../images/password.png);
   background-repeat: no-repeat;
-  background-position: 8px 3px;
+  background-position: 8px 10px;
   padding-left: 30px;
 }
 
 .ftp a, a.ftp, input.ftp, .ftp-menu .menu-title {
   background-image: url(../images/ftp.png);
   background-repeat: no-repeat;
-  background-position: 8px 3px;
+  background-position: 8px 10px;
   padding-left: 30px;
 }
 
 .cron a, a.cron, input.cron, .cron-menu .menu-title {
   background-image: url(../images/schedule.png);
   background-repeat: no-repeat;
-  background-position: 8px 3px;
+  background-position: 8px 10px;
   padding-left: 30px;
 }
 
 .lxc a, a.lxc, input.lxc, .lxc-menu .menu-title {
   background-image: url(../images/ssh.png);
   background-repeat: no-repeat;
-  background-position: 8px 3px;
+  background-position: 8px 10px;
   padding-left: 30px;
 }
 
 .mysql a, a.mysql, input.mysql, .mysql-menu .menu-title {
   background-image: url(../images/mysql.png);
   background-repeat: no-repeat;
-  background-position: 8px 3px;
+  background-position: 8px 10px;
   padding-left: 30px;
 }
 
 .quota a, a.quota, input.quota, .quota-menu .menu-title {
   background-image: url(../images/quota.png);
   background-repeat: no-repeat;
-  background-position: 8px 3px;
+  background-position: 8px 10px;
   padding-left: 30px;
 }
 
 .authip a, a.authip, input.authip, .authip-menu .menu-title {
   background-image: url(../images/ip.png);
   background-repeat: no-repeat;
-  background-position: 8px 3px;
+  background-position: 8px 10px;
   padding-left: 30px;
 }
 
 .log a, a.log, input.log, .log-menu .menu-title {
   background-image: url(../images/logs.png);
   background-repeat: no-repeat;
-  background-position: 8px 3px;
+  background-position: 8px 10px;
   padding-left: 30px;
 }
 
 .help a, a.help, input.help, .help-menu .menu-title {
   background-image: url(../images/help.png);
   background-repeat: no-repeat;
-  background-position: 8px 3px;
+  background-position: 8px 10px;
   padding-left: 30px;
 }
 
 .lang a, a.lang, input.lang, .lang-menu .menu-title {
   background-image: url(../images/lang.png);
   background-repeat: no-repeat;
-  background-position: 8px 3px;
+  background-position: 8px 10px;
   padding-left: 30px;
 }
 
 .mem a, a.mem, input.mem, .mem-menu .menu-title {
   background-image: url(../images/settings.png);
   background-repeat: no-repeat;
-  background-position: 8px 3px;
+  background-position: 8px 10px;
   padding-left: 30px;
 }
 
-.logout a, a.logout, input.logout, .logout-menu .menu-title {
-  background-image: url(../images/exit.png);
-  background-repeat: no-repeat;
-  background-position: 8px 3px;
-  padding-left: 30px;
-}
+
 
 .filter a, a.edit, input.filter {
   background-image: url(../icon/filter.png);
   background-repeat: no-repeat;
-  background-position: 8px 3px;
+  background-position: 8px 8px;
   padding-left: 30px;
 }
 
+
 /* Jquery-ui */
 
+body .ui-tabs {
+  padding: 0em;
+  border: transparent;
+}
+
 body .ui-widget-content {
-/*  margin-top: 15px; */
+  margin-top: 15px;
+  background: #fff;
+}
+
+#b1 {
+  display:contents;
+  background: #fff;
+}
+
+#browseiframe {
+  padding: 20px;
 }
 
 body .ui-widget-header {
-  background: #CFE3F1;
+  background: #fff;
+  border: 1px solid transparent;
+  border-bottom-color: #ddd;
+  border-radius: 4px 4px 0 0;
 }
 
 body .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited {
-  color: #0D5689;
+  color: #337ab7;
 }
 
 body .ui-state-default, body .ui-widget-content .ui-state-default, body .ui-widget-header .ui-state-default {
-  background: #F0F0F4;
+  background: #fff;
+  border: 1px solid transparent;
 }
 
 body .ui-state-active, body .ui-widget-content, body .ui-state-active, body .ui-widget-header .ui-state-active {
-  background: #F0F0F4;
+  border: 1px solid #ddd;
+  color: #555;
+  cursor: default;
+  background-color: #fff;
+  border: 1px solid #ddd;
+}
+
+body .ui-accordion .ui-accordion-content {
+  padding: 0 !important;
+  margin: 0 !important;
+  border: 0;
+  border-radius: 0;
+  border-bottom: 1px solid #ddd;
 }
 
 body .ui-state-active a, body .ui-state-active a:link {
-  color: black;
+  color: #555;
 }
 
 body .ui-tabs .ui-tabs-panel {
-  background: #F0F0F4;
+  background: #fff;
+  margin: 0 !important;
 }
 
 body .ui-tabs .ui-tabs-nav li a {
@@ -1074,7 +1431,15 @@ body .ui-dialog .ui-dialog-title {
 }
 
 body .ui-widget-content a {
-  color: #0D5689;
+  color: #337ab7;
+}
+
+li.ui-state-hover[aria-selected='false'] {
+  background: #eee;
+}
+
+li.ui-state-active[role='tab'] {
+  border-bottom-color: transparent;
 }
 
 .ui-tabs .ui-tabs-nav li.ui-tabs-active a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-tabs-loading a {
@@ -1086,114 +1451,234 @@ body .ui-widget-content a {
 }
 
 .info-toggle {
-  background: none repeat scroll 0 0 #CFE3F1;
+  background: none repeat scroll 0 0 #f5f5f5;
   border: 1px solid #CCCCCC;
   border-radius: 15px 15px 15px 15px;
   margin: 16px 0;
   padding: 0 16px;
 }
 
-th.headerSortUp { 
-  background-image: url(../images/asc.gif); 
+th.headerSortUp {
+  background-image: url(../images/asc.gif);
   background-repeat: no-repeat;
-  background-position: right; 
-  cursor: pointer; 
-  background-color: #3399FF; 
-} 
+  background-position: right;
+  cursor: pointer;
+  background-color: #3399FF;
+}
 
-th.headerSortDown { 
-  background-image: url(../images/desc.gif); 
+th.headerSortDown {
+  background-image: url(../images/desc.gif);
   background-repeat: no-repeat;
-  background-position: right; 
-  cursor: pointer; 
-  background-color: #3399FF; 
-} 
+  background-position: right;
+  cursor: pointer;
+  background-color: #3399FF;
+}
 
 .sub-disabled {
   text-decoration: line-through;
 }
 
-.login_page #global {
-        max-width: 1000px !important;
-        margin: 20px auto !important;
-        width: auto !important;
+.dlogin {
+  text-align: center;
+}
+
+span.menu-title > span > img {
+  display: none;
+
+}
+
+.login_page .inb {
+  display: inline-block;
+  font-weight: 400;
+  text-align: center;
+  white-space: nowrap;
+  vertical-align: middle;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+  border: 1px solid transparent;
+  font-size: 1rem;
+  line-height: 1.5;
+  border-radius: 0.25rem;
+  transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
+  color: #fff;
+  background-color: #5cb85c;
+  border-color: #5cb85c;
+}
+.login_page .inb:hover {
+  text-decoration: none;
+  color: #fff;
+  background-color: #449d44;
+  border-color: #449d44;
+}
+
+.login_page .inb:focus, .login_page .inb.focus {
+  box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.5);
+}
+
+.login_page .inb.disabled, .login_page .inb:disabled {
+  background-color: #5cb85c;
+  border-color: #5cb85c;
 }
 
 
+.login_page .inb:not([disabled]):not(.disabled):active, .login_page .inb:not([disabled]):not(.disabled).active,
+.show > .inb.dropdown-toggle {
+  color: #fff;
+  background-color: #1e7e34;
+  border-color: #1c7430;
+  box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.5);
+}
+
+.login {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+body.login_page {
+  max-height: 100px !important;
+}
+
+.login_page #global {
+  max-width: 1024px !important;
+  margin: 60px auto !important;
+  width: auto !important;
+}
 
 .login_page .unsecure {
-        font-size: 1.1em;
-        width: 90%;
-        margin-bottom: 1em;
+  font-size: 14px;
+  margin-bottom: 1em;
 }
 
 .login_page #content {
-        padding: 10px;
-        width: auto;
+  padding: 10px 10px 10px 0px;
+  border: 1px solid #ddd;
+  border-radius: 5px;
+  width: auto;
 }
-.login_page #logo, .login_page .alternc_powered {
-        text-align:center;
+.login_page #logo, .login_page {
+  text-align:center;
+}
+
+.login_page #logo, .login_page > img {
+  margin-right: 10px;
 }
 
 .login_page .block_list {
-        display: flex;
-        flex-flow: row wrap;
+  display: flex;
+  flex-flow: column;
 }
 .login_page .block_login_page {
-        margin: 10px;
-        width: 420px;
+  margin: 10px 15px;
+}
+
+.login_page .menu-box {
+  width: 400px;
+}
+
+.login_page .block_list .menu-box {
+  display: inline-block;
+}
+
+.menu-title {
+  background-position: 8px 10px !important;
+}
+
+.block_login_page > b {
+
+  font-weight: inherit;
 }
 
 .login_page .menu-box .menu-title {
-        text-align: center;
-        font-weight: bold;
-        font-size: 1.2em;
+  text-align: center;
+  font-size: 1.2em;
 }
 
 .login_page .menu-box .menu-content {
-        margin: 15px;
+  margin: 15px;
 }
+
 .login_page .menu-box .menu-content > div {
-        margin-bottom: 7px;
+  margin-bottom: 7px;
 }
+
 .login_page .menu-box .menu-content label {
-        width: 30%;
-        display: inline-block;
+  width: 25%;
+  margin-bottom: 10px;
+  text-align: left;
+  display: inline-block;
 }
+
 .login_page .menu-box .menu-content input {
-        width: 60%;
+  width: 60%;
 }
+
 .login_page .menu-box .menu-content .submit {
-        text-align: center;
+  text-align: center;
 }
+
 .login_page .menu-box .menu-content input[type='submit']{
-        width: 100px;
-        height: 2em;
+  height: 2em;
+  width: 85%;
+}
+
+small > i {
+  display: flex;
+}
+
+.content {
+  height: 100%;
+}
+
+@media (max-width:1000px) {
+  .login_page .block_login_page {
+    width: 100%;
+  }
+
+  .login_page #global {
+    margin: 0 !important;
+  }
+
+  #global {
+    margin-top: 60px;
+    width: auto;
+    display: flex;
+    min-height: 100%;
+  }
+
+  .global {
+    display: block;
+    width: auto;
+    height: auto;
+  }
+
+  .menu, .content, #menu, #content {
+    float: block;
+    width: auto;
+    height: auto;
+  }
+
+  .content {
+    height: 100%;
+  }
+}
+
+.logout a, a.logout, input.logout, .logout-menu .menu-title {
+  background-image: url(../images/exit.png);
+  background-repeat: no-repeat;
+  background-position: 8px 10px;
+  padding-left: 30px;
+}
+
+.alternc_powered {
+  text-align:right;
 }
 
 .toggle_menu {
-	display: none;
-	position: fixed;
-	top: 10px;
-	right: 10px;
-	z-index: 1000;
-}
-
-@media (max-width:980px) {
-        .login_page .block_login_page {
-                width: 100%;
-        }
-
-        .login_page #global {
-                margin: 0 !important;
-        }
-	#global {
-		display: block;
-		width: auto;
-	}
-
-	#menu, #content {
-		float: none;
-		width:auto;
-	}
+  display: none;
+  position: fixed;
+  top: 10px;
+  right: 10px;
+  z-index: 1000;
 }

From 3647151c6795f16c35dbb2c85395dcaae9a7eefb Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Fri, 9 Mar 2018 12:59:26 -0500
Subject: [PATCH 02/30] Fix #225: call fetchAll on PDO statement

---
 roundcube/class/m_roundcube.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roundcube/class/m_roundcube.php b/roundcube/class/m_roundcube.php
index 2d17734c..6626b6d3 100644
--- a/roundcube/class/m_roundcube.php
+++ b/roundcube/class/m_roundcube.php
@@ -101,7 +101,7 @@ class m_roundcube {
     $req=$stmt->execute(array($fullmail));
 
     if ($req) {
-    foreach ( $req->fetchAll() as $t ) {
+    foreach ( $stmt->fetchAll() as $t ) {
       if (empty($t['user_id'])) continue ;
       $rcuser_id=$t['user_id'];
 

From bbb3e7c0e3f1f2f65ac9f18eb8fd5b512485e5bb Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sun, 15 Apr 2018 18:25:58 -0400
Subject: [PATCH 03/30] Lengthen member's pass column to 255 characters

---
 install/mysql.sql           | 2 +-
 install/upgrades/3.4.11.sql | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 install/upgrades/3.4.11.sql

diff --git a/install/mysql.sql b/install/mysql.sql
index 8a339b25..a41fa6f0 100644
--- a/install/mysql.sql
+++ b/install/mysql.sql
@@ -159,7 +159,7 @@ CREATE TABLE IF NOT EXISTS local (
 CREATE TABLE IF NOT EXISTS membres (
   uid int(10) unsigned NOT NULL auto_increment,		-- Numéro du membre (GID)
   login varchar(128) NOT NULL default '',		-- Nom d`utilisateur
-  pass varchar(64) NOT NULL default '',			-- Mot de passe
+  pass varchar(255) NOT NULL default '',			-- Mot de passe
   enabled tinyint(4) NOT NULL default '1',		-- Le compte est-il actif ?
   su tinyint(4) NOT NULL default '0',			-- Le compte est-il super-admin ?
   mail varchar(128) NOT NULL default '',		-- Adresse email du possesseur
diff --git a/install/upgrades/3.4.11.sql b/install/upgrades/3.4.11.sql
new file mode 100644
index 00000000..7f922d97
--- /dev/null
+++ b/install/upgrades/3.4.11.sql
@@ -0,0 +1 @@
+ALTER TABLE `membres` MODIFY `pass` varchar(255);

From 60846501813db924440985ea4f000574b19a5189 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sun, 15 Apr 2018 18:26:41 -0400
Subject: [PATCH 04/30] Use PHP's built-in password hashing and verification
 for user accounts

---
 bureau/class/functions.php | 13 +++++++++++++
 bureau/class/m_admin.php   |  4 ++--
 bureau/class/m_mem.php     |  6 +++---
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/bureau/class/functions.php b/bureau/class/functions.php
index 0627744e..67b41ea8 100755
--- a/bureau/class/functions.php
+++ b/bureau/class/functions.php
@@ -541,6 +541,19 @@ function _md5cr($pass, $salt = "") {
     return crypt($pass, $salt);
 }
 
+/**
+ * Transtional function to check if a string matches a saved password hash.
+ * @param string $pass string
+ * @param string $hash string
+ * @return bool
+ */
+function _password_verify($pass, $hash) {
+    if (strncmp($hash, '$1$', 3) == 0) {
+        // @TODO Raise a warning for the user to update their password.
+        return _md5cr($pass, $hash) == $hash;
+    }
+    return password_verify($pass, $hash);
+}
 
 /** split mysql database name between username and custom database name
  * @param string $dbname database name
diff --git a/bureau/class/m_admin.php b/bureau/class/m_admin.php
index c16b8523..b2e16083 100644
--- a/bureau/class/m_admin.php
+++ b/bureau/class/m_admin.php
@@ -634,7 +634,7 @@ class m_admin {
             $msg->raise("ERROR", "admin", _("Login can only contains characters a-z, 0-9 and -"));
             return false;
         }
-        $pass = _md5cr($pass);
+        $pass = password_hash($pass);
         $db = new DB_System();
         // Already exist?
         $db->query("SELECT count(*) AS cnt FROM membres WHERE login= ?;", array($login));
@@ -772,7 +772,7 @@ class m_admin {
         $db = new DB_System();
 
         if ($pass) {
-            $pass = _md5cr($pass);
+            $pass = password_hash($pass);
             $second_query = "UPDATE membres SET mail= ?, canpass= ?, enabled= ?, `type`= ?, notes= ? , pass = ? WHERE uid= ?;";
             $second_query_args = array($mail, $canpass, $enabled, $type, $notes, $pass, $uid);
         } else {
diff --git a/bureau/class/m_mem.php b/bureau/class/m_mem.php
index b5420b98..32ce6a55 100644
--- a/bureau/class/m_mem.php
+++ b/bureau/class/m_mem.php
@@ -93,7 +93,7 @@ class m_mem {
             return false;
         }
         $db->next_record();
-        if (_md5cr($password, $db->f("pass")) != $db->f("pass")) {
+        if (!_password_verify($password, $db->f('pass'))) {
             $db->query("UPDATE membres SET lastfail=lastfail+1 WHERE uid= ? ;", array($db->f("uid")));
             $msg->raise("ERROR", "mem", _("User or password incorrect"));
             return false;
@@ -396,7 +396,7 @@ class m_mem {
             $msg->raise("ERROR", "mem", _("You are not allowed to change your password."));
             return false;
         }
-        if ($this->user["pass"] != _md5cr($oldpass, $this->user["pass"])) {
+        if (!_password_verify($oldpass, $this->user['pass'])) {
             $msg->raise("ERROR", "mem", _("The old password is incorrect"));
             return false;
         }
@@ -410,7 +410,7 @@ class m_mem {
         if (!$admin->checkPolicy("mem", $login, $newpass)) {
             return false; // The error has been raised by checkPolicy()
         }
-        $newpass = _md5cr($newpass);
+        $newpass = password_hash($newpass);
         $db->query("UPDATE membres SET pass= ? WHERE uid= ?;", array($newpass, $cuid));
         $msg->init_msgs();
         return true;

From b5382bb13b11820d423f7c4144a77da4e75889db Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sun, 15 Apr 2018 19:02:32 -0400
Subject: [PATCH 05/30] Replace _password_verify with password_verify

PHP's password_verify function does know how to recognize md5 hashes: a custom
check is not necessary.
---
 bureau/class/functions.php | 14 --------------
 bureau/class/m_mem.php     |  4 ++--
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/bureau/class/functions.php b/bureau/class/functions.php
index 67b41ea8..1e00cf36 100755
--- a/bureau/class/functions.php
+++ b/bureau/class/functions.php
@@ -541,20 +541,6 @@ function _md5cr($pass, $salt = "") {
     return crypt($pass, $salt);
 }
 
-/**
- * Transtional function to check if a string matches a saved password hash.
- * @param string $pass string
- * @param string $hash string
- * @return bool
- */
-function _password_verify($pass, $hash) {
-    if (strncmp($hash, '$1$', 3) == 0) {
-        // @TODO Raise a warning for the user to update their password.
-        return _md5cr($pass, $hash) == $hash;
-    }
-    return password_verify($pass, $hash);
-}
-
 /** split mysql database name between username and custom database name
  * @param string $dbname database name
  * @return array returns username as first element, custom name as second
diff --git a/bureau/class/m_mem.php b/bureau/class/m_mem.php
index 32ce6a55..7e31cbd5 100644
--- a/bureau/class/m_mem.php
+++ b/bureau/class/m_mem.php
@@ -93,7 +93,7 @@ class m_mem {
             return false;
         }
         $db->next_record();
-        if (!_password_verify($password, $db->f('pass'))) {
+        if (!password_verify($password, $db->f('pass'))) {
             $db->query("UPDATE membres SET lastfail=lastfail+1 WHERE uid= ? ;", array($db->f("uid")));
             $msg->raise("ERROR", "mem", _("User or password incorrect"));
             return false;
@@ -396,7 +396,7 @@ class m_mem {
             $msg->raise("ERROR", "mem", _("You are not allowed to change your password."));
             return false;
         }
-        if (!_password_verify($oldpass, $this->user['pass'])) {
+        if (!password_verify($oldpass, $this->user['pass'])) {
             $msg->raise("ERROR", "mem", _("The old password is incorrect"));
             return false;
         }

From 971e38778f3d36414fcd1c26db07e36ec9fa7c9a Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sun, 15 Apr 2018 19:03:57 -0400
Subject: [PATCH 06/30] Update stored password hash on user login.

If an md5 hash is stored, a new hash will be calculated and stored.
---
 bureau/class/m_mem.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bureau/class/m_mem.php b/bureau/class/m_mem.php
index 7e31cbd5..d4dce7af 100644
--- a/bureau/class/m_mem.php
+++ b/bureau/class/m_mem.php
@@ -104,6 +104,12 @@ class m_mem {
         }
         $this->user = $db->Record;
         $cuid = $db->f("uid");
+        // Transitional code to update md5 hashed passwords to those created
+        // with password_hash().
+        if (strncmp($db->f('pass'), '$1$', 3) == 0) {
+            $db->query("update membres set pass = ? where uid = ?",
+                       array(password_hash($password), $cuid));
+        }
 
         if (panel_islocked() && $cuid != 2000) {
             $msg->raise("ALERT", "mem", _("This website is currently under maintenance, login is currently disabled."));

From a609984d39a87dd89682422f6abeef7749251066 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sun, 15 Apr 2018 22:00:16 -0400
Subject: [PATCH 07/30] Fix invocations of password_hash()

---
 bureau/class/m_admin.php | 4 ++--
 bureau/class/m_mem.php   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bureau/class/m_admin.php b/bureau/class/m_admin.php
index b2e16083..cd9375db 100644
--- a/bureau/class/m_admin.php
+++ b/bureau/class/m_admin.php
@@ -634,7 +634,7 @@ class m_admin {
             $msg->raise("ERROR", "admin", _("Login can only contains characters a-z, 0-9 and -"));
             return false;
         }
-        $pass = password_hash($pass);
+        $pass = password_hash($pass, PASSWORD_BCRYPT);
         $db = new DB_System();
         // Already exist?
         $db->query("SELECT count(*) AS cnt FROM membres WHERE login= ?;", array($login));
@@ -772,7 +772,7 @@ class m_admin {
         $db = new DB_System();
 
         if ($pass) {
-            $pass = password_hash($pass);
+            $pass = password_hash($pass, PASSWORD_BCRYPT);
             $second_query = "UPDATE membres SET mail= ?, canpass= ?, enabled= ?, `type`= ?, notes= ? , pass = ? WHERE uid= ?;";
             $second_query_args = array($mail, $canpass, $enabled, $type, $notes, $pass, $uid);
         } else {
diff --git a/bureau/class/m_mem.php b/bureau/class/m_mem.php
index d4dce7af..4885bed9 100644
--- a/bureau/class/m_mem.php
+++ b/bureau/class/m_mem.php
@@ -108,7 +108,7 @@ class m_mem {
         // with password_hash().
         if (strncmp($db->f('pass'), '$1$', 3) == 0) {
             $db->query("update membres set pass = ? where uid = ?",
-                       array(password_hash($password), $cuid));
+                       array(password_hash($password, PASSWORD_BCRYPT), $cuid));
         }
 
         if (panel_islocked() && $cuid != 2000) {
@@ -416,7 +416,7 @@ class m_mem {
         if (!$admin->checkPolicy("mem", $login, $newpass)) {
             return false; // The error has been raised by checkPolicy()
         }
-        $newpass = password_hash($newpass);
+        $newpass = password_hash($newpass, PASSWORD_BCRYPT);
         $db->query("UPDATE membres SET pass= ? WHERE uid= ?;", array($newpass, $cuid));
         $msg->init_msgs();
         return true;

From 00c1d554060c13d0f251cf84b825f92caca2a407 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Mon, 16 Apr 2018 21:02:45 -0400
Subject: [PATCH 08/30] Generate SHA512-CRYPT hashes for e-mail addresses

---
 bureau/class/functions.php | 29 +++++++++++++++++++++++++++++
 bureau/class/m_mail.php    |  6 ++++--
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/bureau/class/functions.php b/bureau/class/functions.php
index 0627744e..0b9ad41b 100755
--- a/bureau/class/functions.php
+++ b/bureau/class/functions.php
@@ -1204,3 +1204,32 @@ function csrf_check($token=null) {
     $db->exec("DELETE FROM csrf WHERE created<DATE_SUB(NOW(), INTERVAL 1 DAY);");
     return 1;
 }
+
+/**
+ * Create a password hash for use with dovecot.
+ */
+function _dovecot_hash($password) {
+    // Aim to have a 16 character salt for SHA-512 crypt.
+    // @see https://secure.php.net/manual/en/function.crypt.php
+    if (function_exists('random_bytes')) {
+        // PHP >= 7.0
+        $salt = base64_encode(random_bytes(12));
+    }
+    else if (function_exists('mcrypt_create_iv')) {
+        $salt = base64_encode(mcrypt_create_iv(12, MCRYPT_DEV_URANDOM));
+    }
+    else if (function_exists('')) {
+        $salt  = base64_encode(openssl_random_pseudo_bytes(12));
+    }
+    if (!$salt) {
+        throw Error('Unable to generate salt');
+    }
+    $salt = '$6$rounds=20000$' . $salt;
+    $hash = crypt($password, $salt);
+    // In any case the final password saved for dovecot can store the
+    // scheme to override the default on a per-account basis.
+    // Ideally this is updated to bcrypt or argon2 when those become
+    // available in dovecot.
+    // @see https://wiki.dovecot.org/Authentication/PasswordSchemes
+    return '{SHA512-CRYPT}' . $hash;
+}
diff --git a/bureau/class/m_mail.php b/bureau/class/m_mail.php
index 28bcdb78..eec5c9a0 100644
--- a/bureau/class/m_mail.php
+++ b/bureau/class/m_mail.php
@@ -620,8 +620,10 @@ ORDER BY
             return false;
         }
         if ($canbeempty && empty($pass)) {
-            return $db->query("UPDATE address SET password= ? where id = ? ;", array(null, $mail_id ));
-        } else if (!$db->query("UPDATE address SET password= ? where id = ? ;", array(_md5cr($pass), $mail_id ))) {
+            return $db->query("UPDATE address SET password= ? where id = ? ;",
+                              array(null, $mail_id ));
+        } else if (!$db->query("UPDATE address SET password= ? where id = ? ;",
+                               array(_dovecot_hash($pass), $mail_id ))) {
             return false;
         }
         return true;

From 56cbd2f8b4fc053b60fe76784f119a40a2e36f5d Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Mon, 16 Apr 2018 22:35:41 -0400
Subject: [PATCH 09/30] Move the sha512 crypt hash into it's own function

---
 bureau/class/functions.php | 40 ++++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/bureau/class/functions.php b/bureau/class/functions.php
index dea5fc5f..0fe4f259 100755
--- a/bureau/class/functions.php
+++ b/bureau/class/functions.php
@@ -1205,30 +1205,40 @@ function csrf_check($token=null) {
 }
 
 /**
- * Create a password hash for use with dovecot.
+ * Create a SHA512-CRYPT hash of a string.
  */
-function _dovecot_hash($password) {
-    // Aim to have a 16 character salt for SHA-512 crypt.
-    // @see https://secure.php.net/manual/en/function.crypt.php
-    if (function_exists('random_bytes')) {
-        // PHP >= 7.0
-        $salt = base64_encode(random_bytes(12));
-    }
-    else if (function_exists('mcrypt_create_iv')) {
-        $salt = base64_encode(mcrypt_create_iv(12, MCRYPT_DEV_URANDOM));
-    }
-    else if (function_exists('')) {
-        $salt  = base64_encode(openssl_random_pseudo_bytes(12));
-    }
+function _sha512cr($password, $salt = NULL) {
     if (!$salt) {
-        throw Error('Unable to generate salt');
+        // Aim to have a 16 character salt for SHA-512 crypt.
+        // @see https://secure.php.net/manual/en/function.crypt.php
+        if (function_exists('random_bytes')) {
+            // PHP >= 7.0
+            $salt = base64_encode(random_bytes(12));
+        }
+        else if (function_exists('mcrypt_create_iv')) {
+            $salt = base64_encode(mcrypt_create_iv(12, MCRYPT_DEV_URANDOM));
+        }
+        else if (function_exists('')) {
+            $salt  = base64_encode(openssl_random_pseudo_bytes(12));
+        }
+        if (!$salt) {
+            throw Error('Unable to generate salt');
+        }
     }
     $salt = '$6$rounds=20000$' . $salt;
     $hash = crypt($password, $salt);
+    return $hash;
+}
+
+/**
+ * Create a password hash for use with dovecot.
+ */
+function _dovecot_hash($password) {
     // In any case the final password saved for dovecot can store the
     // scheme to override the default on a per-account basis.
     // Ideally this is updated to bcrypt or argon2 when those become
     // available in dovecot.
     // @see https://wiki.dovecot.org/Authentication/PasswordSchemes
+    $hash = _sha512cr($password);
     return '{SHA512-CRYPT}' . $hash;
 }

From 88f34571911b109cf2224cfd84ffe413d0d32450 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Mon, 16 Apr 2018 22:46:05 -0400
Subject: [PATCH 10/30] Use sha512 crypt to store ftp password hashes

---
 bureau/class/m_ftp.php      | 4 ++--
 install/mysql.sql           | 2 +-
 install/upgrades/3.4.11.sql | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bureau/class/m_ftp.php b/bureau/class/m_ftp.php
index 74b02788..11566a79 100644
--- a/bureau/class/m_ftp.php
+++ b/bureau/class/m_ftp.php
@@ -321,7 +321,7 @@ class m_ftp {
                     return false; // The error has been raised by checkPolicy()
                 }
             }
-            $encrypted_password = _md5cr($pass, strrev(microtime(true)));
+            $encrypted_password = _sha512cr($pass);
             $db->query("UPDATE ftpusers SET name= ? , password='', encrypted_password= ?, homedir= ?, uid= ? WHERE id= ?;", array($full_login, $encrypted_password, $absolute, $cuid, $id));
         } else {
             $db->query("UPDATE ftpusers SET name= ? , homedir= ? , uid= ? WHERE id= ? ;", array($full_login, $absolute, $cuid, $id));
@@ -406,7 +406,7 @@ class m_ftp {
         }
 
         if ($quota->cancreate("ftp")) {
-            $encrypted_password = _md5cr($pass, strrev(microtime(true)));
+            $encrypted_password = _sha512cr($pass);
             $db->query("INSERT INTO ftpusers (name,password, encrypted_password,homedir,uid) VALUES ( ?, '', ?, ?, ?)", array($full_login, $encrypted_password, $absolute, $cuid));
             return true;
         } else {
diff --git a/install/mysql.sql b/install/mysql.sql
index a41fa6f0..cc3f1d07 100644
--- a/install/mysql.sql
+++ b/install/mysql.sql
@@ -129,7 +129,7 @@ CREATE TABLE IF NOT EXISTS ftpusers (
   id int(10) unsigned NOT NULL auto_increment,
   name varchar(64) NOT NULL default '',
   password varchar(32) NOT NULL default '',
-  encrypted_password VARCHAR(32) default NULL,
+  encrypted_password VARCHAR(255) default NULL,
   homedir varchar(128) NOT NULL default '',
   uid int(10) unsigned NOT NULL default '0',
   enabled boolean NOT NULL DEFAULT TRUE,
diff --git a/install/upgrades/3.4.11.sql b/install/upgrades/3.4.11.sql
index 7f922d97..643d3bc8 100644
--- a/install/upgrades/3.4.11.sql
+++ b/install/upgrades/3.4.11.sql
@@ -1 +1,2 @@
 ALTER TABLE `membres` MODIFY `pass` varchar(255);
+ALTER TABLE `ftpusers` MODIFY `encrypted_password` varchar(255);

From 0385a933f765046c391f948011583ec44a13d2e1 Mon Sep 17 00:00:00 2001
From: Steven Mondji-Lerider <squidly@nnx.com>
Date: Fri, 12 Apr 2013 13:59:30 +0000
Subject: [PATCH 11/30] Fixes : #1480

(cherry picked from commit af974c7b8320d2071d62a5396d5e742094b35267)
---
 roundcube/roundcube-install | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/roundcube/roundcube-install b/roundcube/roundcube-install
index 81011d12..f5280cb0 100644
--- a/roundcube/roundcube-install
+++ b/roundcube/roundcube-install
@@ -88,3 +88,8 @@ EOF
     
 fi
 
+#This is necessary because upgrading roundcube from 7.1 to 7.2 changes this setting
+if [ "$1" = "end" ]; then
+  chown alternc-roundcube:root /etc/roundcube/main.inc.php
+fi
+

From 41278cc72a28a746eb245ec07fad9c43a0643da6 Mon Sep 17 00:00:00 2001
From: Dominique Rousseau <d.rousseau@nnx.com>
Date: Mon, 14 May 2018 10:02:44 +0200
Subject: [PATCH 12/30] correct wrong owner for roundcube temp_dir
 /var/lib/roundcube/temp

---
 roundcube/roundcube-install | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/roundcube/roundcube-install b/roundcube/roundcube-install
index f5280cb0..9833cee1 100644
--- a/roundcube/roundcube-install
+++ b/roundcube/roundcube-install
@@ -88,8 +88,10 @@ EOF
     
 fi
 
-#This is necessary because upgrading roundcube from 7.1 to 7.2 changes this setting
 if [ "$1" = "end" ]; then
+  #This is necessary because upgrading roundcube from 7.1 to 7.2 changes this setting
   chown alternc-roundcube:root /etc/roundcube/main.inc.php
+  # In case owner is reset to www-data
+  chown alternc-roundcube:nogroup /var/lib/roundcube/temp
 fi
 

From 4d8d2c1c393f34336fe8590587bd528f495dd3a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonathan=20Demmerl=C3=A9?=
 <32387906+Welmoc@users.noreply.github.com>
Date: Thu, 21 Jun 2018 10:25:41 +0200
Subject: [PATCH 13/30] some fixes

@media (max-width: is ugly, but well, better than nothing.
---
 bureau/admin/styles/style.css | 189 ++++++++++++++++++++++++----------
 1 file changed, 133 insertions(+), 56 deletions(-)

diff --git a/bureau/admin/styles/style.css b/bureau/admin/styles/style.css
index 4fce8f71..b63b992e 100644
--- a/bureau/admin/styles/style.css
+++ b/bureau/admin/styles/style.css
@@ -1,4 +1,3 @@
-
 :root {
   --blue: #007bff;
   --indigo: #6610f2;
@@ -55,7 +54,6 @@ body.light {
 }
 
 table {
-  border: 1px solid #ddd;
   border-radius: 5px;
 }
 
@@ -79,6 +77,10 @@ thead tr th:hover, table.tlist tbody tr:first-child th:hover {
   background-color: #f8f8f8 !important;
 }
 
+tbody tr:first-child {
+  border-bottom: 1px solid #eee;
+}
+
 table.tlist > tbody > tr.lst:hover,
 table.tlist > tbody > tr.lst > td:hover,
 form[action="adm_dodel.php"] > table.tlist > tbody > tr:hover,
@@ -86,6 +88,18 @@ form[action="adm_dodel.php"] > table.tlist > tbody > tr > td:hover {
   background-color: #DFEEF8 !important;
 }
 
+table.tlist > tbody > tr.lst:first-child {
+  background-color: #fff;
+}
+
+table.tlist > thead {
+  border-bottom: 1px solid #eee;
+}
+
+table.tlist > thead + tbody > tr.lst {
+  border-bottom: transparent !important;
+}
+
 tr:hover,  td:hover
 {
   background-color: transparent;
@@ -127,6 +141,7 @@ h3 {
 
 .trbtn {
   text-align: right;
+
 }
 
 h4 {
@@ -148,8 +163,8 @@ hr {
   display: none;
 }
 
-.block_login_page br, td br, form > br, p.hlp > br {
-  display: contents !important;
+.block_login_page br, td br, form > br, p.hlp > br, td br {
+  display: block !important;
 }
 
 a {
@@ -200,6 +215,15 @@ div.ui-accordion-content > ul {
   margin-top: 0px !important;
 }
 
+select {
+  border: 1px solid #999;
+  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+  font-size: 13px;
+  color: black;
+  background: white;
+  text-transform: lowercase;
+}
+
 .inc, .inl {
   border: 1px solid #999;
   font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
@@ -208,7 +232,20 @@ div.ui-accordion-content > ul {
   background: white;
 }
 
-body.light input.inb, input.ina{
+#inp1 {
+  min-width: 50%;
+  margin-top: 5px;
+}
+
+form > br + .inb, form > br + .ina, form > br + .inb + .inb, form > br + .ina + .inb, form > br + .inb + .ina, form > br + .ina + .ina {
+  margin-top: 10px;
+}
+
+p > input#file + br + .inb, p > input#file + br + .inb + .inb {
+  margin-top: 10px;
+}
+
+.showdirsize_button {
   margin-top: 10px;
 }
 
@@ -226,13 +263,12 @@ input.inb, input.ina{
   vertical-align: middle;
   padding-left: 10px;
   height: auto;
-  margin-top: auto;
 }
 
 input.inb:hover, input.ina:hover {
   border: 1px solid #999;
   text-decoration: none;
-  background-color: #DFEEF8;
+  background-color: #F8F8F8;
 }
 
 input.inb:focus, input.ina.focus {
@@ -313,25 +349,24 @@ input.ina:hover, input.inav:hover {
   border: 1px solid #999;
   font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
   font-size: 14px;
-  padding: 2px 4px 2px 4px;
   color: black;
   cursor: pointer;
 }
 
+input.ina[name="actdel"], input.ina[name="actrename"], input.ina[name="actperms"], input.ina[name="actcopy"], input.ina[name="actmove"] {
+  padding-top: 5px;
+  padding-bottom: 4px;
+}
+
 input.ina, .ina a, .inb a, input.inb, input.ina,
-input.ina:hover, .ina a:hover, .inb a:hover,
 input.inav, .inav a {
-  background-color: #F8F8F8;
+  background-color: #fff;
 }
 
 input.inav:hover, .inav a:hover, a.inav:hover,
-input.ina, .ina a  {
-  background-color: #fff;
+input.ina:hover, .ina a:hover, .inb a:hover {
+  background-color: #F8F8F8;
 }
-/*
-.ina-active a, a.ina-active, input.ina-active {
-background-color: #C1FFCD;
-}*/
 
 .ina a, a.ina, .inb a, a.inb,.inav a, a.inav {
   color: black;
@@ -353,23 +388,31 @@ background-color: #C1FFCD;
 #emaildom.int, #newsubname.int, #create_dom_list {
   border-top-left-radius: 0px;
   border-bottom-left-radius: 0px;
-  padding-bottom: 4px;
-  padding-top: 4px;
   padding-right: 10px;
 }
 
 #tabsdom-addsub #newsubname.int {
   border-top-left-radius: 0px;
   border-bottom-left-radius: 0px;
-  padding-bottom: 5px;
-  padding-top: 3px;
   padding-right: 10px;
+  display: inline-table;
+  padding-top: 0.23em;
+  padding-bottom: 0.23em;
+}
+
+span#newsubname {
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+  padding-right: 10px;
+  display: inline-table;
+  padding-top: 0.28em;
+  padding-bottom: 0.18em;
 }
 
 .int#sub, .int#mail_arg {
   border-top-right-radius: 0px;
   border-bottom-right-radius: 0px;
-  padding-top: 2px;
+  display: inline-table;
 }
 
 .ina a:hover, a.ina:hover, .inb a:hover, a.inb:hover,.inav a:hover, a.inav:hover {
@@ -406,10 +449,11 @@ form[action='adm_dodefquotas.php'] table {
   border: 1px solid #ccc;
   border-radius: 4px;
   transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
-  min-height: 26px;
+  min-height: 2em;
 }
 
 span.intleft, #usernpfx, #newdomwww {
+  display: inline-table;
   border-top-right-radius: 0px;
   border-bottom-right-radius: 0px;
   padding-bottom: 4px;
@@ -417,6 +461,15 @@ span.intleft, #usernpfx, #newdomwww {
   padding-right: 10px;
 }
 
+form#formlist1 > span.int.intleft {
+  padding-bottom: 0.14em;
+  padding-top: 0.43em;
+}
+
+input[name="domain_id"] + input.inb.add {
+  margin-top: -4px;
+}
+
 #create_dom_list_pfx {
   border-top-right-radius: 0px;
   border-bottom-right-radius: 0px;
@@ -451,6 +504,11 @@ input.intright {
   border-bottom-left-radius: 0px;
 }
 
+input.int[name="userfile"] {
+  padding-top: 5px;
+  padding-bottom: 2px;
+}
+
 .intleft {
   border-right: 0px;
   padding-right: 0px;
@@ -804,8 +862,7 @@ form[action="mman_edit.php"] > table > tbody > tr.lst1:hover, form[action="mman_
 }
 
 table.searchtable {
-  width: 700px;
-  border: 1px dotted #99f;
+  width: 900px;
   margin: 20px 0 20px 0px;
 }
 
@@ -820,10 +877,6 @@ table.searchtable td {
   margin-right: auto;
   bottom: 0;
 }
-/*
-.logout-menu {
-  margin-bottom: 100%;
-}*/
 
 #content > .center {
     display: none;
@@ -839,6 +892,7 @@ table.searchtable td {
 
 
 #sendthisfile {
+  display: flex;
   margin-top: 6px;
 }
 
@@ -870,6 +924,9 @@ input#email {
 span#emaildom {
   border-left: 0;
   padding-left: 2px;
+  display: inline-table;
+  padding-top: 0.28em;
+  padding-bottom: 0.18em;
 }
 
 .tedit {
@@ -913,10 +970,6 @@ table.tlistb, .tlistb tr, form > table {
   border: 1px solid transparent;
 }
 
-.tlist th, .tlist2 th {
-  font-size: 125%;
-}
-
 input#dir, input#sub_local {
   width: 200px;
 }
@@ -978,6 +1031,7 @@ input#dir, input#sub_local {
 .menu-quota div.progress-bar {
   width: 180px;
   background: #fff;
+  color: white;
   border: 1px solid transparent;
   margin-left: 10px;
   display: none;
@@ -1006,7 +1060,6 @@ div.progress-bar div.barre {
 
 div.progress-bar div.txt {
   position: absolute;
-  top: 3px;
   left: 0;
   width: 100%;
   text-align:center;
@@ -1033,35 +1086,35 @@ div.progress-bar div.txt {
 .edit a, a.edit, input.edit {
   background-image: url(../images/edit.png);
   background-repeat: no-repeat;
-  background-position: 8px 8px;
+  background-position: 8px 5px;
   padding-left: 30px;
 }
 
 .view a, a.view, input.view {
   background-image: url(../images/code.png);
   background-repeat: no-repeat;
-  background-position: 8px 8px;
+  background-position: 8px 5px;
   padding-left: 30px;
 }
 
 .lock a, a.lock, input.lock {
   background-image: url(../icon/encrypted.png);
   background-repeat: no-repeat;
-  background-position: 8px 8px;
+  background-position: 8px 5px;
   padding-left: 30px;
 }
 
 .settings a, a.settings, input.settings {
   background-image: url(../icon/settings.png);
   background-repeat: no-repeat;
-  background-position: 8px 8px;
+  background-position: 8px 5px;
   padding-left: 30px;
 }
 
 .ok a, a.ok, input.ok {
   background-image: url(../icon/ok.png);
   background-repeat: no-repeat;
-  background-position: 8px 8px;
+  background-position: 8px 5px;
   padding-left: 30px;
   color: #fff;
   background-color: #5cb85c;
@@ -1071,7 +1124,7 @@ div.progress-bar div.txt {
 input.ok:hover, input.ok:focus {
   background-image: url(../icon/ok.png);
   background-repeat: no-repeat;
-  background-position: 8px 8px;
+  background-position: 8px 5px;
   padding-left: 30px;
   color: #fff;
   background-color: #449d44;
@@ -1087,7 +1140,7 @@ input[value="Delete the checked users"] {
 input.add, span.add .ina {
   background-image: url(../icon/add.png);
   background-repeat: no-repeat;
-  background-position: 8px 8px;
+  background-position: 8px 5px;
   padding-left: 30px;
 }
 
@@ -1101,7 +1154,7 @@ div > .add a:hover, p > a.add:hover {
 input.add:hover, input.add:focus {
   background-image: url(../icon/add.png);
   background-repeat: no-repeat;
-  background-position: 8px 8px;
+  background-position: 8px 5px;
   padding-left: 30px;
   color: #fff;
   background-color: #449d44;
@@ -1111,7 +1164,7 @@ input.add:hover, input.add:focus {
 .delete a, a.delete, input.delete {
   background-image: url(../icon/delete.png);
   background-repeat: no-repeat;
-  background-position: 8px 8px;
+  background-position: 8px 5px;
   padding-left: 30px;
 }
 
@@ -1125,7 +1178,7 @@ div > .delete a:hover, p > a.delete:hover {
 input.delete:hover, input.delete:focus {
   background-image: url(../icon/delete.png);
   background-repeat: no-repeat;
-  background-position: 8px 8px;
+  background-position: 8px 5px;
   padding-left: 30px;
   color: #fff;
   background-color: #d9534f;
@@ -1135,14 +1188,14 @@ input.delete:hover, input.delete:focus {
 .cancel a, a.cancel, input.cancel {
   background-image: url(../icon/cancel.png);
   background-repeat: no-repeat;
-  background-position: 8px 8px;
+  background-position: 8px 5px;
   padding-left: 30px;
 }
 
 input.cancel:hover {
   background-image: url(../icon/cancel.png);
   background-repeat: no-repeat;
-  background-position: 8px 8px;
+  background-position: 8px 5px;
   padding-left: 30px;
   background-color: #fcf8e3;
 }
@@ -1150,7 +1203,7 @@ input.cancel:hover {
 input.cancel:active {
   background-image: url(../icon/cancel.png);
   background-repeat: no-repeat;
-  background-position: 8px 8px;
+  background-position: 8px 5px;
   padding-left: 30px;
   background-color: #f0ad4e;
   border-color: #eea236;
@@ -1175,35 +1228,35 @@ input.cancel:active {
 .configure a, a.configure, input.configure {
   background-image: url(../icon/configure.png);
   background-repeat: no-repeat;
-  background-position: 8px 8px;
+  background-position: 8px 5px;
   padding-left: 30px;
 }
 
 .edit a, a.edit, input.edit {
   background-image: url(../icon/edit.png);
   background-repeat: no-repeat;
-  background-position: 8px 8px;
+  background-position: 8px 5px;
   padding-left: 30px;
 }
 
 .save a, a.save, input.save {
   background-image: url(../icon/save.png);
   background-repeat: no-repeat;
-  background-position: 8px 8px;
+  background-position: 8px 5px;
   padding-left: 30px;
 }
 
 .down a, a.down, input.down {
   background-image: url(../icon/save.png);
   background-repeat: no-repeat;
-  background-position: 8px 8px;
+  background-position: 8px 5px;
   padding-left: 30px;
 }
 
 .up a, a.up, input.up {
   background-image: url(../icon/up.png);
   background-repeat: no-repeat;
-  background-position: 8px 8px;
+  background-position: 8px 5px;
   padding-left: 30px;
   padding-top: 5px;
   padding-bottom: 5px;
@@ -1212,7 +1265,7 @@ input.cancel:active {
 .up a:hover, a.up:hover, input.up:hover {
   background-image: url(../icon/up.png);
   background-repeat: no-repeat;
-  background-position: 8px 8px;
+  background-position: 8px 5px;
   padding-left: 30px;
   padding-top: 5px;
   padding-bottom: 5px;
@@ -1226,7 +1279,7 @@ input.cancel:active {
 .back a, a.back, input.back {
   background-image: url(../icon/back.png);
   background-repeat: no-repeat;
-  background-position: 8px 8px;
+  background-position: 8px 5px;
   padding-left: 30px;
 }
 
@@ -1349,7 +1402,7 @@ input.cancel:active {
 .filter a, a.edit, input.filter {
   background-image: url(../icon/filter.png);
   background-repeat: no-repeat;
-  background-position: 8px 8px;
+  background-position: 8px 5px;
   padding-left: 30px;
 }
 
@@ -1392,7 +1445,6 @@ body .ui-state-default, body .ui-widget-content .ui-state-default, body .ui-widg
 }
 
 body .ui-state-active, body .ui-widget-content, body .ui-state-active, body .ui-widget-header .ui-state-active {
-  border: 1px solid #ddd;
   color: #555;
   cursor: default;
   background-color: #fff;
@@ -1552,11 +1604,12 @@ body.login_page {
 }
 
 .login_page #content {
-  padding: 10px 10px 10px 0px;
+  padding: 10px 10px 10px 10px;
   border: 1px solid #ddd;
   border-radius: 5px;
   width: auto;
 }
+
 .login_page #logo, .login_page {
   text-align:center;
 }
@@ -1669,6 +1722,7 @@ small > i {
   background-repeat: no-repeat;
   background-position: 8px 10px;
   padding-left: 30px;
+  text-align: center;
 }
 
 .alternc_powered {
@@ -1682,3 +1736,26 @@ small > i {
   right: 10px;
   z-index: 1000;
 }
+
+@media (max-width:2000px) {
+  span#emaildom {
+    padding-top: 0.17em;
+    padding-bottom: 0.27em;
+  }
+  form#formlist1 > span.int.intleft {
+    padding-bottom: 0.15em;
+    padding-top: 0.4em;
+  }
+  span.intright {
+    padding-bottom: 0.4em;
+    padding-top: 0.25em;
+  }
+  span#newsubname {
+    padding-top: 0.17em;
+    padding-bottom: 0.27em;
+  }
+  #tabsdom-addsub #newsubname.int {
+    padding-top: 0.1em;
+    padding-bottom: 0.35em;
+  }
+}

From f930bde36d454cbf6215d4b5c19f52bf364d61ce Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@sonntag.fr>
Date: Thu, 21 Jun 2018 17:29:42 +0200
Subject: [PATCH 14/30] adding all patched from squeeze to wheezy then jessie.

---
 debian/alternc-roundcube.postinst             |    8 +-
 debian/changelog                              |   14 +
 debian/control                                |   22 +-
 debian/control.orig                           |  323 ++++
 etc/alternc/templates/alternc/apache2.conf    |   11 +-
 etc/alternc/templates/alternc/bureau.conf     |    2 +-
 etc/alternc/templates/apache2/vhost.conf      |    5 +-
 ...ict-quota.conf => alternc-dict-quota.conf} |    0
 .../{dovecot-sql.conf => alternc-sql.conf}    |   27 +-
 .../templates/dovecot/conf.d/95_alternc.conf  |  344 +++++
 etc/alternc/templates/dovecot/dovecot.conf    | 1296 -----------------
 install/alternc.install                       |   59 +-
 install/alternc.install.orig                  |  647 ++++++++
 roundcube/roundcube-install                   |   14 +-
 roundcube/templates/roundcube/config.inc.php  |   83 ++
 roundcube/templates/roundcube/main.inc.php    |  803 ----------
 .../roundcube/plugins/password/config.inc.php |  227 ++-
 ssl/alternc-ssl.install.php                   |   23 +-
 ssl/ssl.conf                                  |    2 +-
 19 files changed, 1661 insertions(+), 2249 deletions(-)
 create mode 100644 debian/control.orig
 rename etc/alternc/templates/dovecot/{dovecot-dict-quota.conf => alternc-dict-quota.conf} (100%)
 rename etc/alternc/templates/dovecot/{dovecot-sql.conf => alternc-sql.conf} (88%)
 create mode 100644 etc/alternc/templates/dovecot/conf.d/95_alternc.conf
 delete mode 100644 etc/alternc/templates/dovecot/dovecot.conf
 create mode 100644 install/alternc.install.orig
 create mode 100644 roundcube/templates/roundcube/config.inc.php
 delete mode 100644 roundcube/templates/roundcube/main.inc.php

diff --git a/debian/alternc-roundcube.postinst b/debian/alternc-roundcube.postinst
index 6dfe23c9..0d99169d 100644
--- a/debian/alternc-roundcube.postinst
+++ b/debian/alternc-roundcube.postinst
@@ -27,10 +27,10 @@ case "$1" in
 	chown -R www-data:root /etc/roundcube/debian-db.php
 	chmod -R 460 /etc/roundcube/debian-db.php
 
-	dpkg-statoverride --list /etc/roundcube/main.inc.php >/dev/null && 
-	dpkg-statoverride --remove /etc/roundcube/main.inc.php
-	chown -R www-data:root /etc/roundcube/main.inc.php
-	chmod -R 460 /etc/roundcube/main.inc.php
+	dpkg-statoverride --list /etc/roundcube/config.inc.php >/dev/null && 
+	dpkg-statoverride --remove /etc/roundcube/config.inc.php
+	chown -R www-data:root /etc/roundcube/config.inc.php
+	chmod -R 460 /etc/roundcube/config.inc.php
 
 	dpkg-statoverride --list /var/log/roundcube >/dev/null && 
 	dpkg-statoverride --remove /var/log/roundcube
diff --git a/debian/changelog b/debian/changelog
index 943f76d2..3ed86856 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+alternc (3.3.10) stable; urgency=low
+
+  * Version identical to 3.1 for Squeeze
+  * Includes small patches / dependency for apache & dovecot 2.0 for Jessie
+
+ -- Benjamin Sonntag <benjamin@sonntag.fr>  Fri, 15 Jan 2016 15:26:00 +0100
+
+alternc (3.2.10) oldstable; urgency=low
+
+  * Version identical to 3.1 for Squeeze
+  * Includes a small dovecot patch / dependency for dovecot 2.0 for Wheezy
+
+ -- Benjamin Sonntag <benjamin@sonntag.fr>  Fri, 15 Jan 2016 15:26:00 +0100
+
 alternc (3.1.11) oldoldstable; urgency=low
 
   * fix This is a big security upgrade of AlternC 3.x
diff --git a/debian/control b/debian/control
index 394506f9..551f6171 100644
--- a/debian/control
+++ b/debian/control
@@ -38,16 +38,19 @@ Depends: debianutils (>= 1.13.1)
        , sudo
        , adduser
        , dnsutils
-       , dovecot-common (>=1:1.2.15)
-       , dovecot-common(<< 1:2.0)
-       , dovecot-imapd (>= 1:1.2.15)
-       , dovecot-pop3d (>= 1:1.2.15)
+       , dovecot-core (>=1:2.1.7)
+       , dovecot-imapd (>=1:2.1.7)
+       , dovecot-pop3d (>=1:2.1.7)
+       , dovecot-mysql
        , vlogger
        , mailutils | mailx
        , zip
        , incron
        , cron
        , opendkim
+       , opendkim-tools
+       , dovecot-sieve
+       , dovecot-managesieved
        , mysql-client(>= 5.0) | mariadb-client
        , php5-curl | php7.0-curl
        , quota
@@ -123,15 +126,18 @@ Depends: debianutils (>= 1.13.1)
          , gettext (>= 0.10.40-5)
          , adduser
          , sudo
-         , dovecot-common (>=1:1.2.15)
-         , dovecot-common(<< 1:2.0)
-         , dovecot-imapd (>= 1:1.2.15)
-         , dovecot-pop3d (>= 1:1.2.15)
+         , dovecot-core (>=1:2.1.7)
+         , dovecot-imapd (>=1:2.1.7)
+         , dovecot-pop3d (>=1:2.1.7)
+         , dovecot-mysql
          , vlogger
          , mailutils | mailx
          , incron
          , cron
          , opendkim
+         , opendkim-tools
+         , dovecot-sieve
+         , dovecot-managesieved
          , mysql-client(>= 5.0) | mariadb-client
          , php5-curl
          , ${misc:Depends}
diff --git a/debian/control.orig b/debian/control.orig
new file mode 100644
index 00000000..394506f9
--- /dev/null
+++ b/debian/control.orig
@@ -0,0 +1,323 @@
+Source: alternc
+Section: admin
+Priority: optional
+Maintainer: Benjamin Sonntag <benjamin@alternc.org>
+Build-Depends-Indep: perl
+                   , findutils (>= 4.1.7)
+                   , gettext (>= 0.10.40-5)
+Build-Depends: debhelper (>= 8)
+             , po-debconf
+Standards-Version: 3.9.4
+
+Package: alternc
+Architecture: all
+Pre-depends: debconf (>= 0.5.00) | debconf-2.0
+           , bash (>= 4)
+           , acl
+Depends: debianutils (>= 1.13.1)
+       , apache2-mpm-itk | libapache2-mpm-itk
+       , libapache2-mod-php5 | libapache2-mod-php7.0
+       , php5-mysql | php7.0-mysql
+       , phpmyadmin
+       , postfix
+       , proftpd-mod-mysql
+       , proftpd-basic
+       , bind9
+       , wget
+       , rsync
+       , ca-certificates
+       , locales
+       , perl-suid | perl
+       , postfix-mysql
+       , wwwconfig-common
+       , sasl2-bin
+       , libsasl2-modules
+       , php5-cli | php7.0-cli
+       , lockfile-progs (>= 0.1.9)
+       , gettext (>= 0.10.40-5)
+       , sudo
+       , adduser
+       , dnsutils
+       , dovecot-common (>=1:1.2.15)
+       , dovecot-common(<< 1:2.0)
+       , dovecot-imapd (>= 1:1.2.15)
+       , dovecot-pop3d (>= 1:1.2.15)
+       , vlogger
+       , mailutils | mailx
+       , zip
+       , incron
+       , cron
+       , opendkim
+       , mysql-client(>= 5.0) | mariadb-client
+       , php5-curl | php7.0-curl
+       , quota
+       , pwgen
+       , ${misc:Depends}
+Recommends: mysql-server(>= 5.0) | mariadb-server
+          , ntp
+          , unzip
+          , bzip2
+Conflicts: alternc-admintools
+        , alternc-awstats (<< 1.0)
+        , alternc-webalizer (<= 0.9.4)
+        , alternc-mailman (<< 2.0)
+        , courier-authlib
+Provides: alternc-admintools
+Replaces: alternc-admintools
+Suggests: alternc-awstats
+       , alternc-mailman
+       , alternc-changepass
+       , amavisd-new
+       , clamav-daemon
+       , spamassassin
+       , pop-before-smtp
+       , magpierss
+       , ncompress
+       , alternc-squirrelmail
+       , alternc-roundcube
+Description: Hosting software managment suite for Debian
+ AlternC is a mutualized hosting software manager for Linux.
+ It allows you to manage your websites, domains, ftp, emails, aliases,
+ web statistics, mailing-lists, jabber accounts, etc.
+ .
+ AlternC is mainly a PHP based administration interface and some conf files
+ for the software used by it. 
+ .
+ More information at http://www.alternc.com/
+Homepage: http://www.alternc.com/
+Description-fr.UTF-8: Suite logicielle d'hébergement mutualisé pour Debian
+ AlternC est un logiciel d'hébergement mutualisé pour serveur Linux.
+ Il permet de gérer les sites web, domaines, ftp, emails, alias,
+ statistiques web, listes de discussions, comptes jabber, etc.
+ .
+ AlternC est essentiellement une interface d'administration en PHP et
+ quelques fichiers de configuration pour les logiciels qu'il utilise.
+ .
+ Pour plus d'informations, consultez http://www.alternc.com/
+
+Package: alternc-slave
+Architecture: all
+Pre-depends: debconf (>= 0.5.00) | debconf-2.0, acl
+Depends: debianutils (>= 1.13.1)
+         , apache2-mpm-itk | libapache2-mpm-itk
+         , libapache2-mod-php5 | libapache2-mod-php7.0
+         , php5-mysql | php7.0-mysql
+         , phpmyadmin
+         , postfix
+         , proftpd-mod-mysql
+         , proftpd-basic
+         , postfix-tls
+         , bind9
+         , wget
+         , rsync
+         , ca-certificates
+         , locales
+         , perl-suid
+         , perl
+         , postfix-mysql
+         , wwwconfig-common
+         , sasl2-bin
+         , libsasl2-modules
+         , php5-cli | php7.0-cli
+         , lockfile-progs (>= 0.1.9)
+         , gettext (>= 0.10.40-5)
+         , adduser
+         , sudo
+         , dovecot-common (>=1:1.2.15)
+         , dovecot-common(<< 1:2.0)
+         , dovecot-imapd (>= 1:1.2.15)
+         , dovecot-pop3d (>= 1:1.2.15)
+         , vlogger
+         , mailutils | mailx
+         , incron
+         , cron
+         , opendkim
+         , mysql-client(>= 5.0) | mariadb-client
+         , php5-curl
+         , ${misc:Depends}
+Recommends:
+         quota
+Conflicts: alternc-admintools
+         , alternc-awstats (<= 0.3.2)
+         , alternc-webalizer (<= 0.9.4)
+         , alternc
+Provides: alternc
+Replaces: alternc
+Suggests: alternc-awstats
+         , alternc-mailman
+         , alternc-changepass
+         , amavisd-new
+         , clamav-daemon
+         , spamassassin
+         , pop-before-smtp
+         , magpierss
+         , zip
+         , ncompress
+         , bzip2
+Description: Hosting software managment suite for Debian
+ AlternC is a mutualized hosting software manager for Linux.
+ It allows you to manage your websites, domains, ftp, emails, aliases,
+ web statistics, mailing-lists, jabber accounts, etc.
+ .
+ AlternC is mainly a PHP based administration interface and some conf files
+ for the software used by it. 
+ .
+ This package is designed for frontend nodes in a load balancing setup, where
+ the AlternC directory is not touched and managed over NFS.
+ . 
+ More information at http://www.alternc.com/
+Homepage: http://www.alternc.com/
+Description-fr.UTF-8: Suite logicielle d'hébergement mutualisé pour Debian
+ AlternC est un logiciel d'hébergement mutualisé pour serveur Linux.
+ Il permet de gérer les sites web, domaines, ftp, emails, alias,
+ statistiques web, listes de discussions, comptes jabber, etc.
+ .
+ AlternC est essentiellement une interface d'administration en PHP et
+ quelques fichiers de configuration pour les logiciels qu'il utilise.
+ .
+ Ce paquet permet de construire un noeud frontal dans une configuration avec
+ répartiteur de charge, ou le dossier /var/alternc n'est pas modifié et géré
+ à travers NFS.
+ .
+ Pour plus d'informations, consultez http://www.alternc.com/
+
+Package: alternc-squirrelmail
+Architecture: all
+Pre-depends: debconf (>= 0.5.00) | debconf-2.0
+Depends: debianutils (>= 1.13.1)
+       , alternc (>= 3.0~rc1)
+       , squirrelmail
+       , squirrelmail-locales
+       , avelsieve
+       , ${misc:Depends}
+Conflicts: alternc (<= 1.0.3)
+       , alternc-changepass
+Provides: alternc-webmail
+Suggests: 
+Description: Squirrelmail-Webmail plugin and configuration for AlternC
+ AlternC is a mutualized hosting software manager for Linux.
+ It allows you to manage your websites, domains, ftp, emails, aliases,
+ web statistics, mailing-lists, jabber accounts, etc.
+ .
+ This extension to AlternC is installing and configuring properly the
+ Squirrelmail Webmail. It also configure Avelsieve to allow server-side
+ filtering, the password changing through MySQL, and the automatic
+ creation of proper profile with the right address and language.
+ .
+ More information at http://www.alternc.com/
+Homepage: http://www.alternc.com/
+Description-fr.UTF-8: Webmail Squirrelmail pour AlternC
+ AlternC est un logiciel d'hébergement mutualisé pour serveur Linux.
+ Il permet de gérer les sites web, domaines, ftp, emails, alias,
+ statistiques web, listes de discussions, comptes jabber, etc.
+ .
+ Cette extension d'AlternC installe et configure le webmail Squirrelmail.
+ Il configure aussi Avelsieve pour permettre l'accès au filtrage du courrier
+ côté serveur, ainsi que le changement de mot de passe via MySQL et la création
+ automatique des profiles avec la bonne adresse et la bonne langue.
+ .
+ Pour plus d'informations, consultez http://www.alternc.com/
+
+Package: alternc-roundcube
+Architecture: all
+Pre-depends: debconf (>= 0.5.00) | debconf-2.0
+Depends: debianutils (>= 1.13.1)
+       , alternc (>= 3.0~rc1)
+       , roundcube (>= 0.7.1)
+       , roundcube-mysql (>= 0.7.1)
+       , roundcube-plugins (>= 0.7.1)
+       , imagemagick
+       , ${misc:Depends}
+Conflicts: alternc (<< 1.1)
+Provides: alternc-webmail
+Suggests: 
+Description: Roundcube-Webmail plugin and configuration for AlternC
+ AlternC is a mutualized hosting software manager for Linux.
+ It allows you to manage your websites, domains, ftp, emails, aliases,
+ web statistics, mailing-lists, jabber accounts, etc.
+ .
+ This extension to AlternC is installing and configuring properly the
+ Roundcube Webmail. It also configure sieve to allow server-side
+ filtering, the password changing through MySQL, and the automatic
+ creation of proper profile with the right address and language.
+ .
+ More information at http://www.alternc.com/
+Homepage: http://www.alternc.com/
+Description-fr.UTF-8: Webmail Roundcube pour AlternC
+ AlternC est un logiciel d'hébergement mutualisé pour serveur Linux.
+ Il permet de gérer les sites web, domaines, ftp, emails, alias,
+ statistiques web, listes de discussions, comptes jabber, etc.
+ .
+ Cette extension d'AlternC installe et configure le webmail Roundcube.
+ Il configure aussi sieve pour permettre l'accès au filtrage du courrier
+ côté serveur, ainsi que le changement de mot de passe via MySQL et la création
+ automatique des profiles avec la bonne adresse et la bonne langue.
+ .
+ Pour plus d'informations, consultez http://www.alternc.com/
+
+Package: alternc-awstats
+Priority: optional
+Section: admin
+Architecture: all
+Pre-depends: debconf
+Depends: alternc (>= 3.0~rc1)
+       , awstats (>=6.1-1)
+       , php5-cli | php7.0-cli
+       , ${misc:Depends}
+Suggests: apachemerge
+Description: Awstats statistics module for AlternC
+ AlternC is a mutualized hosting software manager for Linux.
+ It allows you to manage your websites,   domains, ftp, emails, aliases,
+ web statistics, mailing-lists, jabber accounts, etc.
+ .
+ This package is an optional module that adds awstats statistics
+ to the virtual desktop.
+ .
+ More information on http://www.alternc.com/.
+
+Package: alternc-api
+Architecture: all
+Pre-depends: debconf (>= 0.5.00) | debconf-2.0
+Depends: debianutils (>= 1.13.1)
+       , alternc (>= 3.0)
+       , ${misc:Depends}
+Conflicts: alternc (<< 3.0)
+Description: Rest or get/post API for AlternC
+ AlternC is a mutualized hosting software manager for Linux.
+ It allows you to manage your websites, domains, ftp, emails, aliases,
+ web statistics, mailing-lists, jabber accounts, etc.
+ .
+ This extension to AlternC is installing and configuring properly the
+ GET/POST/REST API. You can then use https://yourpanel/api/ as an endpoint
+ to launch remotely any functions of the hosting control panel.
+ .
+ More information at http://www.alternc.com/
+Homepage: http://www.alternc.com/
+
+Package: alternc-ssl
+Priority: optional
+Section: admin
+Architecture: all
+Depends: openssl
+    , mysql-client | mariadb-client
+    , debconf
+    , alternc (>= 3.0)
+    , php5-cli | php7.0-cli
+    , ${misc:Depends}
+Conflicts: alternc (<< 3.0)
+Description: HTTPS module for AlternC
+ AlternC is a mutualized hosting software manager for Linux.
+ It allows you to manage your websites, domains, ftp, emails, aliases,
+ web statistics, mailing-lists, jabber accounts, etc.
+ .
+ This package is an optional module that adds HTTPS vhosts and SSL Certificates
+ management to the virtual desktop. 
+ .
+ More information on http://www.alternc.com/
+Description-fr.UTF-8: Module HTTPS pour AlternC
+ AlternC est un logiciel d'hébergement mutualisé pour serveur Linux.
+ Il permet de gérer les sites web, domaines, ftp, emails, alias,
+ statistiques web, listes de discussions, comptes jabber, etc.
+ .
+ Ce paquet est un module optionnel qui permet aux utilisateurs
+ de gérer des hôtes virtuels HTTPS et des certificats SSL dans AlternC.
diff --git a/etc/alternc/templates/alternc/apache2.conf b/etc/alternc/templates/alternc/apache2.conf
index 514d695d..0732de07 100644
--- a/etc/alternc/templates/alternc/apache2.conf
+++ b/etc/alternc/templates/alternc/apache2.conf
@@ -9,12 +9,9 @@
 # Define the default user and group for mpm-itk
 AssignUserId www-data www-data
 
-# Logformat information
-Include /etc/alternc/apache_logformat.conf
-
 # Deny access to the root filesystem
 <Directory />
-  Options FollowSymLinks
+  Options +FollowSymLinks
   AllowOverride None
   Order allow,deny
   Deny from all
@@ -45,7 +42,7 @@ ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
 
 <Directory %%ALTERNC_HTML%% >
   AllowOverride AuthConfig FileInfo Limit Options Indexes
-  Options Indexes Includes -FollowSymLinks MultiViews SymLinksIfOwnerMatch
+  Options -Indexes +Includes -FollowSymLinks +MultiViews +SymLinksIfOwnerMatch
   Order allow,deny
   Allow from all
   php_admin_flag safe_mode_gid off
@@ -65,13 +62,13 @@ ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
 
 <Directory /usr/share/phpmyadmin>
   AllowOverride AuthConfig Options FileInfo Limit Indexes
-  Options Indexes Includes FollowSymLinks MultiViews
+  Options +Indexes +Includes +FollowSymLinks +MultiViews
   Order allow,deny
   Allow from all
 </Directory>
 <Directory /usr/share/squirrelmail>
   AllowOverride AuthConfig Options FileInfo Limit Indexes
-  Options Indexes Includes FollowSymLinks MultiViews
+  Options +Indexes +Includes +FollowSymLinks +MultiViews
   Order allow,deny
   Allow from all
 </Directory>
diff --git a/etc/alternc/templates/alternc/bureau.conf b/etc/alternc/templates/alternc/bureau.conf
index aa7066b9..65bca635 100644
--- a/etc/alternc/templates/alternc/bureau.conf
+++ b/etc/alternc/templates/alternc/bureau.conf
@@ -33,5 +33,5 @@
 
 
   # will be used to define aliases such as /javascript /webmail /squirrelmail ...
-  Include /etc/alternc/apache-panel.d/*.conf
+  IncludeOptional /etc/alternc/apache-panel.d/*.conf
 
diff --git a/etc/alternc/templates/apache2/vhost.conf b/etc/alternc/templates/apache2/vhost.conf
index 77f5e038..8b4f304f 100644
--- a/etc/alternc/templates/apache2/vhost.conf
+++ b/etc/alternc/templates/apache2/vhost.conf
@@ -9,8 +9,11 @@
     php_admin_value upload_tmp_dir %%account_root%%/tmp
     php_admin_value sendmail_path '/usr/lib/alternc/sendmail "%%mail_account%%" '
     php_admin_flag mail.add_x_header on
-    Options +MultiViews -FollowSymLinks +SymLinksIfOwnerMatch
+    Options -MultiViews -FollowSymLinks +SymLinksIfOwnerMatch
     AllowOverride AuthConfig FileInfo Limit Options Indexes
+    Order allow,deny
+    Allow from all
+    Require all granted
   </Directory>
 
 # If you want to log the errors also in /var/log/alternc/sites/ 
diff --git a/etc/alternc/templates/dovecot/dovecot-dict-quota.conf b/etc/alternc/templates/dovecot/alternc-dict-quota.conf
similarity index 100%
rename from etc/alternc/templates/dovecot/dovecot-dict-quota.conf
rename to etc/alternc/templates/dovecot/alternc-dict-quota.conf
diff --git a/etc/alternc/templates/dovecot/dovecot-sql.conf b/etc/alternc/templates/dovecot/alternc-sql.conf
similarity index 88%
rename from etc/alternc/templates/dovecot/dovecot-sql.conf
rename to etc/alternc/templates/dovecot/alternc-sql.conf
index befef217..e4bad783 100644
--- a/etc/alternc/templates/dovecot/dovecot-sql.conf
+++ b/etc/alternc/templates/dovecot/alternc-sql.conf
@@ -2,11 +2,10 @@
 # Modify template in /etc/alternc/templates/
 # and launch alternc.install if you want 
 # to modify this file.
-#
-
+# 
 # This file is opened as root, so it should be owned by root and mode 0600.
 #
-# http://wiki.dovecot.org/AuthDatabase/SQL
+# http://wiki2.dovecot.org/AuthDatabase/SQL
 #
 # For the sql passdb module, you'll need a database with a table that
 # contains fields for at least the username and password. If you want to
@@ -36,9 +35,14 @@ driver = mysql
 
 # Database connection string. This is driver-specific setting.
 #
+# HA / round-robin load-balancing is supported by giving multiple host
+# settings, like: host=sql1.host.org host=sql2.host.org
+#
 # pgsql:
 #   For available options, see the PostgreSQL documention for the
 #   PQconnectdb function of libpq.
+#   Use maxconns=n (default 5) to change how many connections Dovecot can
+#   create to pgsql.
 #
 # mysql:
 #   Basic options emulate PostgreSQL option names:
@@ -53,11 +57,9 @@ driver = mysql
 #                           the default my.cnf location
 #     option_group        - Read options from the given group (default: client)
 # 
-#   You can connect to UNIX sockets by using host: host=/var/run/mysqld/mysqld.sock
+#   You can connect to UNIX sockets by using host: host=/var/run/mysql.sock
 #   Note that currently you can't use spaces in parameters.
 #
-#   MySQL supports multiple host parameters for load balancing / HA.
-#
 # sqlite:
 #   The path to the database file.
 #
@@ -71,7 +73,7 @@ connect = host=%%dbhost%% dbname=%%dbname%% user=%%db_mail_user%% password=%%db_
 # Default password scheme.
 #
 # List of supported schemes is in
-# http://wiki.dovecot.org/Authentication/PasswordSchemes
+# http://wiki2.dovecot.org/Authentication/PasswordSchemes
 #
 default_pass_scheme = MD5
 
@@ -86,9 +88,9 @@ default_pass_scheme = MD5
 # and "domain" fields instead of "user".
 #
 # The query can also return other fields which have a special meaning, see
-# http://wiki.dovecot.org/PasswordDatabase/ExtraFields
+# http://wiki2.dovecot.org/PasswordDatabase/ExtraFields
 #
-# Commonly used available substitutions (see http://wiki.dovecot.org/Variables
+# Commonly used available substitutions (see http://wiki2.dovecot.org/Variables
 # for full list):
 #   %u = entire user@domain
 #   %n = user part of user@domain
@@ -115,18 +117,21 @@ default_pass_scheme = MD5
 # None of these are strictly required. If you use a single UID and GID, and
 # home or mail directory fits to a template string, you could use userdb static
 # instead. For a list of all fields that can be returned, see
-# http://wiki.dovecot.org/UserDatabase/ExtraFields
+# http://wiki2.dovecot.org/UserDatabase/ExtraFields
 #
 # Examples:
 #   user_query = SELECT home, uid, gid FROM users WHERE userid = '%u'
 #   user_query = SELECT dir AS home, user AS uid, group AS gid FROM users where userid = '%u'
 #   user_query = SELECT home, 501 AS uid, 501 AS gid FROM users WHERE userid = '%u'
-#
+# 
 user_query = SELECT userdb_home AS home, userdb_uid AS uid, 1998 AS gid, userdb_quota_rule AS quota_rule FROM dovecot_view WHERE user = '%u';
 
 # If you wish to avoid two SQL lookups (passdb + userdb), you can use
 # userdb prefetch instead of userdb sql in dovecot.conf. In that case you'll
 # also have to return userdb fields in password_query prefixed with "userdb_"
 # string. For example:
+# 
 password_query = SELECT user, password, userdb_home, userdb_uid, 1998 AS userdb_gid,userdb_quota_rule FROM dovecot_view where user= '%u'; 
 
+# Query to get a list of all usernames.
+#iterate_query = SELECT username AS user FROM users
diff --git a/etc/alternc/templates/dovecot/conf.d/95_alternc.conf b/etc/alternc/templates/dovecot/conf.d/95_alternc.conf
new file mode 100644
index 00000000..dda55336
--- /dev/null
+++ b/etc/alternc/templates/dovecot/conf.d/95_alternc.conf
@@ -0,0 +1,344 @@
+# AUTO GENERATED FILE
+# Modify template in /etc/alternc/templates/
+# and launch alternc.install if you want 
+# to modify this file.
+#
+## Dovecot configuration file
+# This is a concatenation of all /etc/dovecot/conf.d/* from DEBIAN package
+# with rules adapted to AlternC best practices and link with MySQL tables.
+
+protocols = imap pop3 sieve
+
+default_process_limit = 1000
+
+## -------------------------------------------------------------------------
+## 10-auth
+
+# Disable LOGIN command and all other plaintext authentications unless
+# SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP
+# matches the local IP (ie. you're connecting from the same computer), the
+# connection is considered secure and plaintext authentication is allowed.
+disable_plaintext_auth = no
+
+# Space separated list of wanted authentication mechanisms:
+#   plain login digest-md5 cram-md5 ntlm rpa apop anonymous gssapi otp skey
+#   gss-spnego
+# NOTE: See also disable_plaintext_auth setting.
+auth_mechanisms = plain login
+
+##
+## Password and user databases
+##
+
+#
+# Password database is used to verify user's password (and nothing more).
+# You can have multiple passdbs and userdbs. This is useful if you want to
+# allow both system users (/etc/passwd) and virtual users to login without
+# duplicating the system users into virtual database.
+#
+# <doc/wiki/PasswordDatabase.txt>
+#
+# User database specifies where mails are located and what user/group IDs
+# own them. For single-UID configuration use "static" userdb.
+#
+# <doc/wiki/UserDatabase.txt>
+
+#!include auth-deny.conf.ext
+#!include auth-master.conf.ext
+
+#!include auth-system.conf.ext
+#!include auth-sql.conf.ext
+#!include auth-ldap.conf.ext
+#!include auth-passwdfile.conf.ext
+#!include auth-checkpassword.conf.ext
+#!include auth-vpopmail.conf.ext
+#!include auth-static.conf.ext
+
+
+# ----------------------------------------------------------------------------
+# 10-login.conf
+
+# Prefix for each line written to log file. % codes are in strftime(3)
+# format.
+#log_timestamp = "%b %d %H:%M:%S "
+log_timestamp = "%Y-%m-%d %H:%M:%S "
+
+# ----------------------------------------------------------------------------
+# 10-mail.conf
+
+
+# Location for users' mailboxes. This is the same as the old default_mail_env
+# setting. The default is empty, which means that Dovecot tries to find the
+# mailboxes automatically. This won't work if the user doesn't have any mail
+# yet, so you should explicitly tell Dovecot the full location.
+#
+# If you're using mbox, giving a path to the INBOX file (eg. /var/mail/%u)
+# isn't enough. You'll also need to tell Dovecot where the other mailboxes are
+# kept. This is called the "root mail directory", and it must be the first
+# path given in the mail_location setting.
+#
+# There are a few special variables you can use, eg.:
+#
+#   %u - username
+#   %n - user part in user@domain, same as %u if there's no domain
+#   %d - domain part in user@domain, empty if there's no domain
+#   %h - home directory
+#
+# See </usr/share/doc/dovecot-common/wiki/Variables.txt> for full list.
+# Some examples:
+#
+#   mail_location = maildir:~/Maildir
+#   mail_location = mbox:~/mail:INBOX=/var/mail/%u
+#   mail_location = mbox:/var/mail/%d/%1n/%n:INDEX=/var/indexes/%d/%1n/%n
+#
+# </usr/share/doc/dovecot-common/wiki/MailLocation.txt>
+#
+mail_location = maildir:~/Maildir
+
+
+# Group to enable temporarily for privileged operations. Currently this is
+# used only with INBOX when either its initial creation or dotlocking fails.
+# Typically this is set to "mail" to give access to /var/mail.
+#mail_privileged_group =
+mail_privileged_group = vmail
+
+
+# Valid UID range for users, defaults to 500 and above. This is mostly
+# to make sure that users can't log in as daemons or other system users.
+# Note that denying root logins is hardcoded to dovecot binary and can't
+# be done even if first_valid_uid is set to 0.
+first_valid_uid = 2000
+last_valid_uid = 65000
+
+# ----------------------------------------------------------------------------
+# 10-master.conf
+
+passdb {
+  driver = sql
+  args = /etc/dovecot/alternc-sql.conf
+}
+
+userdb {
+  driver = sql
+  args = /etc/dovecot/alternc-sql.conf
+}
+userdb {
+  driver = prefetch
+}
+
+service auth {
+  unix_listener /var/spool/postfix/private/auth {
+    group = postfix
+    mode = 0660
+    user = postfix
+  }
+  unix_listener auth-master {
+    mode = 0600
+    user = vmail
+  }
+
+  # set this to (default_client_limit * number of services using it) 
+  client_limit = 5000
+}
+
+service anvil {
+  # set this to (default_client_limit * number of services using it) 
+  client_limit = 5000
+}
+
+
+# ----------------------------------------------------------------------------
+# 10-ssl.conf
+
+# SSL/TLS support: yes, no, required. </usr/share/doc/dovecot-common/wiki/SSL.txt>
+ssl = yes
+
+# PEM encoded X.509 SSL/TLS certificate and private key. They're opened before
+# dropping root privileges, so keep the key file unreadable by anyone but
+# root.
+#ssl_cert = </etc/dovecot/dovecot.pem
+#ssl_cert_file = /etc/alternc/apache.pem
+#ssl_key = </etc/dovecot/dovecot.pem
+#ssl_key_file = /etc/alternc/apache.pem
+
+
+# ----------------------------------------------------------------------------
+# 15-lda.conf
+
+##
+## LDA specific settings
+##
+
+protocol lda {
+  # Address to use when sending rejection mails (e.g. postmaster@example.com).
+  postmaster_address = postmaster@localhost
+
+  # Hostname to use in various parts of sent mails, eg. in Message-Id.
+  # Default is the system's real hostname.
+  #hostname = 
+
+  # Support for dynamically loadable plugins. mail_plugins is a space separated
+  # list of plugins to load.
+  mail_plugins = quota sieve
+  #mail_plugin_dir = /usr/lib/dovecot/modules/lda
+
+
+  # UNIX socket path to master authentication server to find users.
+  auth_socket_path = /var/run/dovecot/auth-master
+}
+
+
+# ----------------------------------------------------------------------------
+# 20-imap.conf
+
+protocol imap {
+  # Support for dynamically loadable plugins. mail_plugins is a space separated
+  # list of plugins to load.
+  mail_plugins = quota imap_quota 
+  #mail_plugin_dir = /usr/lib/dovecot/modules/imap
+  mail_max_userip_connections = 500
+}
+
+service imap {
+  executable = imap imap-postlogin
+  vsz_limit = 512M
+}
+
+service imap-postlogin {
+	executable =   script-login /usr/lib/alternc/popimap-log-login.sh
+  # the script process runs as the user specified here (v2.0.14+):
+#  user = $default_internal_user
+  # this UNIX socket listener must use the same name as given to imap executable
+  unix_listener imap-postlogin {
+  }
+}
+
+# ----------------------------------------------------------------------------
+# 20-managesieve.conf
+
+protocol sieve {
+  managesieve_notify_capability = mailto
+  managesieve_sieve_capability = fileinto reject envelope encoded-character vacation subaddress comparator-i;ascii-numeric relational regex imap4flags copy include variables body enotify environment mailbox date ihave
+}
+
+service managesieve {
+  executable = /usr/lib/dovecot/managesieve
+}
+
+
+
+# ----------------------------------------------------------------------------
+# 20-pop3.conf
+
+protocol pop3 {
+
+  # POP3 UIDL (unique mail identifier) format to use. You can use following
+  # variables, along with the variable modifiers described in
+  # </usr/share/doc/dovecot-common/wiki/Variables.txt> (e.g. %Uf for the
+  # filename in uppercase)
+  #
+  #  %v - Mailbox's IMAP UIDVALIDITY
+  #  %u - Mail's IMAP UID
+  #  %m - MD5 sum of the mailbox headers in hex (mbox only)
+  #  %f - filename (maildir only)
+  #
+  # If you want UIDL compatibility with other POP3 servers, use:
+  #  UW's ipop3d         : %08Xv%08Xu
+  #  Courier             : %f or %v-%u (both might be used simultaneosly)
+  #  Cyrus (<= 2.1.3)    : %u
+  #  Cyrus (>= 2.1.4)    : %v.%u
+  #  Dovecot v0.99.x     : %v.%u
+  #  tpop3d              : %Mf
+  #
+  # Note that Outlook 2003 seems to have problems with %v.%u format which was
+  # Dovecot's default, so if you're building a new server it would be a good
+  # idea to change this. %08Xu%08Xv should be pretty fail-safe.
+  #
+  pop3_uidl_format = %08Xu%08Xv
+
+  # Support for dynamically loadable plugins. mail_plugins is a space separated
+  # list of plugins to load.
+  mail_plugins = quota
+  #mail_plugin_dir = /usr/lib/dovecot/modules/pop3
+
+}
+
+service pop3 {
+  executable = /usr/lib/alternc/popimap-log-login.sh /usr/lib/dovecot/pop3
+}
+
+# ----------------------------------------------------------------------------
+# 90-plugin.conf
+
+plugin {
+
+  # Quota plugin. Multiple backends are supported:
+  #   dirsize: Find and sum all the files found from mail directory.
+  #            Extremely SLOW with Maildir. It'll eat your CPU and disk I/O.
+  #   dict: Keep quota stored in dictionary (eg. SQL)
+  #   maildir: Maildir++ quota
+  #   fs: Read-only support for filesystem quota
+  #
+  # Quota limits are set using "quota_rule" parameters, either in here or in
+  # userdb. It's also possible to give mailbox-specific limits, for example:
+  #   quota_rule = *:storage=1048576
+     quota_rule = *:storage=100M
+     quota_rule2 = Trash:storage=+10%%
+  #   quota_rule2 = Trash:storage=102400
+  # User has now 1GB quota, but when saving to Trash mailbox the user gets
+  # additional 100MB.
+  #
+  # Multiple quota roots are also possible, for example:
+  #   quota = dict:user::proxy::quota
+  #   quota2 = dict:domain:%d:proxy::quota_domain
+  #   quota_rule = *:storage=102400
+  #   quota2_rule = *:storage=1048576
+  # Gives each user their own 100MB quota and one shared 1GB quota within
+  # the domain.
+  #
+  # You can execute a given command when user exceeds a specified quota limit.
+  # Each quota root has separate limits. Only the command for the first
+  # exceeded limit is excecuted, so put the highest limit first.
+  # Note that % needs to be escaped as %%, otherwise "% " expands to empty.
+  #   quota_warning = storage=95%% /usr/local/bin/quota-warning.sh 95
+  #   quota_warning2 = storage=80%% /usr/local/bin/quota-warning.sh 80
+     quota_warning = storage=95%% /usr/lib/alternc/quota-warning.sh 95
+     quota_warning2 = storage=80%% /usr/lib/alternc/quota-warning.sh 80
+  #quota = maildir
+  quota = dict:user::proxy::quotadict
+
+
+  # Sieve plugin (http://wiki.dovecot.org/LDA/Sieve) and ManageSieve service
+  #
+  # Location of the active script. When ManageSieve is used this is actually
+  # a symlink pointing to the active script in the sieve storage directory.
+  sieve=~/.dovecot.sieve
+  #
+  # The path to the directory where the personal Sieve scripts are stored. For
+  # ManageSieve this is where the uploaded scripts are stored.
+  sieve_dir=~/sieve
+}
+
+# Dictionary can be used by some plugins to store key=value lists, such as
+# quota, expire and acl plugins. The dictionary can be used either directly or
+# though a dictionary server. The following dict block maps dictionary names to
+# URIs when the server is used. These can then be referenced using URIs in
+# format "proxy::<name>".
+
+dict {
+  quotadict = mysql:/etc/dovecot/alternc-dict-quota.conf
+  #expire = db:/var/lib/dovecot/expire.db
+}
+
+
+service auth-worker {
+  user = vmail
+}
+
+service dict {
+  unix_listener dict {
+    mode = 0660
+    user = vmail
+    group = vmail
+  }
+}
diff --git a/etc/alternc/templates/dovecot/dovecot.conf b/etc/alternc/templates/dovecot/dovecot.conf
deleted file mode 100644
index 4af42e21..00000000
--- a/etc/alternc/templates/dovecot/dovecot.conf
+++ /dev/null
@@ -1,1296 +0,0 @@
-# AUTO GENERATED FILE
-# Modify template in /etc/alternc/templates/
-# and launch alternc.install if you want 
-# to modify this file.
-#
-## Dovecot configuration file
-
-# If you're in a hurry, see http://wiki.dovecot.org/QuickConfiguration
-
-# "dovecot -n" command gives a clean output of the changed settings. Use it
-# instead of copy&pasting this file when posting to the Dovecot mailing list.
-
-# '#' character and everything after it is treated as comments. Extra spaces
-# and tabs are ignored. If you want to use either of these explicitly, put the
-# value inside quotes, eg.: key = "# char and trailing whitespace  "
-
-# Default values are shown for each setting, it's not required to uncomment
-# those. These are exceptions to this though: No sections (e.g. namespace {})
-# or plugin settings are added by default, they're listed only as examples.
-# Paths are also just examples with the real defaults being based on configure
-# options. The paths listed here are for configure --prefix=/usr
-# --sysconfdir=/etc --localstatedir=/var --with-ssldir=/etc/ssl
-
-# Base directory where to store runtime data.
-#base_dir = /var/run/dovecot
-
-# Protocols we want to be serving: imap imaps pop3 pop3s managesieve
-# If you only want to use dovecot-auth, you can set this to "none".
-protocols = imap imaps pop3 pop3s managesieve
-
-# A space separated list of IP or host addresses where to listen in for
-# connections. "*" listens in all IPv4 interfaces. "[::]" listens in all IPv6
-# interfaces. Use "*, [::]" for listening both IPv4 and IPv6.
-#
-# If you want to specify ports for each service, you will need to configure
-# these settings inside the protocol imap/pop3/managesieve { ... } section,
-# so you can specify different ports for IMAP/POP3/MANAGESIEVE. For example:
-#   protocol imap {
-#     listen = *:10143
-#     ssl_listen = *:10943
-#     ..
-#   }
-#   protocol pop3 {
-#     listen = *:10100
-#     ..
-#   }
-#   protocol managesieve {
-#     listen = *:12000
-#     ..
-#   }
-listen = *
-
-# Disable LOGIN command and all other plaintext authentications unless
-# SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP
-# matches the local IP (ie. you're connecting from the same computer), the
-# connection is considered secure and plaintext authentication is allowed.
-disable_plaintext_auth = yes
-
-# Should all IMAP and POP3 processes be killed when Dovecot master process
-# shuts down. Setting this to "no" means that Dovecot can be upgraded without
-# forcing existing client connections to close (although that could also be
-# a problem if the upgrade is eg. because of a security fix). This however
-# means that after master process has died, the client processes can't write
-# to log files anymore.
-#shutdown_clients = yes
-
-##
-## Logging
-##
-
-# Log file to use for error messages, instead of sending them to syslog.
-# /dev/stderr can be used to log into stderr.
-#log_path = 
-
-# Log file to use for informational and debug messages.
-# Default is the same as log_path.
-#info_log_path = 
-
-# Prefix for each line written to log file. % codes are in strftime(3)
-# format.
-#log_timestamp = "%b %d %H:%M:%S "
-log_timestamp = "%Y-%m-%d %H:%M:%S "
-
-# Syslog facility to use if you're logging to syslog. Usually if you don't
-# want to use "mail", you'll use local0..local7. Also other standard
-# facilities are supported.
-#syslog_facility = mail
-
-##
-## SSL settings
-##
-
-# IP or host address where to listen in for SSL connections. Remember to also
-# add imaps and/or pop3s to protocols setting. Defaults to same as "listen"
-# setting if not specified.
-#ssl_listen =
-
-# SSL/TLS support: yes, no, required. </usr/share/doc/dovecot-common/wiki/SSL.txt>
-ssl = required
-
-# PEM encoded X.509 SSL/TLS certificate and private key. They're opened before
-# dropping root privileges, so keep the key file unreadable by anyone but
-# root.
-ssl_cert_file = /etc/ssl/certs/ssl-cert-snakeoil.pem
-#ssl_cert_file = /etc/alternc/apache.pem
-ssl_key_file = /etc/ssl/private/ssl-cert-snakeoil.key
-#ssl_key_file = /etc/alternc/apache.pem
-
-# If key file is password protected, give the password here. Alternatively
-# give it when starting dovecot with -p parameter. Since this file is often
-# world-readable, you may want to place this setting instead to a different
-# root owned 0600 file by using !include_try <path>.
-#ssl_key_password =
-
-# File containing trusted SSL certificate authorities. Set this only if you
-# intend to use ssl_verify_client_cert=yes. The CAfile should contain the
-# CA-certificate(s) followed by the matching CRL(s).
-#ssl_ca_file = 
-
-# Request client to send a certificate. If you also want to require it, set
-# ssl_require_client_cert=yes in auth section.
-#ssl_verify_client_cert = no
-
-# Which field from certificate to use for username. commonName and
-# x500UniqueIdentifier are the usual choices. You'll also need to set
-# ssl_username_from_cert=yes.
-#ssl_cert_username_field = commonName
-
-# How often to regenerate the SSL parameters file. Generation is quite CPU
-# intensive operation. The value is in hours, 0 disables regeneration
-# entirely.
-#ssl_parameters_regenerate = 168
-
-# SSL ciphers to use
-#ssl_cipher_list = ALL:!LOW:!SSLv2
-
-# Show protocol level SSL errors.
-#verbose_ssl = no
-
-##
-## Login processes
-##
-
-# </usr/share/doc/dovecot-common/wiki/LoginProcess.txt>
-
-# Directory where authentication process places authentication UNIX sockets
-# which login needs to be able to connect to. The sockets are created when
-# running as root, so you don't have to worry about permissions. Note that
-# everything in this directory is deleted when Dovecot is started.
-#login_dir = /var/run/dovecot/login
-
-# chroot login process to the login_dir. Only reason not to do this is if you
-# wish to run the whole Dovecot without roots. </usr/share/doc/dovecot-common/wiki/Rootless.txt>
-#login_chroot = yes
-
-# User to use for the login process. Create a completely new user for this,
-# and don't use it anywhere else. The user must also belong to a group where
-# only it has access, it's used to control access for authentication process.
-# Note that this user is NOT used to access mails. </usr/share/doc/dovecot-common/wiki/UserIds.txt>
-#login_user = dovecot
-
-# Set max. process size in megabytes. If you don't use
-# login_process_per_connection you might need to grow this.
-#login_process_size = 64
-
-# Should each login be processed in it's own process (yes), or should one
-# login process be allowed to process multiple connections (no)? Yes is more
-# secure, espcially with SSL/TLS enabled. No is faster since there's no need
-# to create processes all the time.
-#login_process_per_connection = yes
-
-# Number of login processes to keep for listening new connections.
-#login_processes_count = 3
-
-# Maximum number of login processes to create. The listening process count
-# usually stays at login_processes_count, but when multiple users start logging
-# in at the same time more extra processes are created. To prevent fork-bombing
-# we check only once in a second if new processes should be created - if all
-# of them are used at the time, we double their amount until the limit set by
-# this setting is reached.
-#login_max_processes_count = 128
-
-# Maximum number of connections allowed per each login process. This setting
-# is used only if login_process_per_connection=no. Once the limit is reached,
-# the process notifies master so that it can create a new login process.
-#login_max_connections = 256
-
-# Greeting message for clients.
-#login_greeting = Dovecot ready.
-
-# Space separated list of trusted network ranges. Connections from these
-# IPs are allowed to override their IP addresses and ports (for logging and
-# for authentication checks). disable_plaintext_auth is also ignored for
-# these networks. Typically you'd specify your IMAP proxy servers here.
-#login_trusted_networks =
-
-# Space-separated list of elements we want to log. The elements which have
-# a non-empty variable value are joined together to form a comma-separated
-# string.
-#login_log_format_elements = user=<%u> method=%m rip=%r lip=%l %c
-
-# Login log format. %$ contains login_log_format_elements string, %s contains
-# the data we want to log.
-#login_log_format = %$: %s
-
-##
-## Mailbox locations and namespaces
-##
-
-# Location for users' mailboxes. This is the same as the old default_mail_env
-# setting. The default is empty, which means that Dovecot tries to find the
-# mailboxes automatically. This won't work if the user doesn't have any mail
-# yet, so you should explicitly tell Dovecot the full location.
-#
-# If you're using mbox, giving a path to the INBOX file (eg. /var/mail/%u)
-# isn't enough. You'll also need to tell Dovecot where the other mailboxes are
-# kept. This is called the "root mail directory", and it must be the first
-# path given in the mail_location setting.
-#
-# There are a few special variables you can use, eg.:
-#
-#   %u - username
-#   %n - user part in user@domain, same as %u if there's no domain
-#   %d - domain part in user@domain, empty if there's no domain
-#   %h - home directory
-#
-# See </usr/share/doc/dovecot-common/wiki/Variables.txt> for full list.
-# Some examples:
-#
-#   mail_location = maildir:~/Maildir
-#   mail_location = mbox:~/mail:INBOX=/var/mail/%u
-#   mail_location = mbox:/var/mail/%d/%1n/%n:INDEX=/var/indexes/%d/%1n/%n
-#
-# </usr/share/doc/dovecot-common/wiki/MailLocation.txt>
-#
-mail_location = maildir:~/Maildir
-
-# If you need to set multiple mailbox locations or want to change default
-# namespace settings, you can do it by defining namespace sections.
-#
-# You can have private, shared and public namespaces. Private namespaces
-# are for user's personal mails. Shared namespaces are for accessing other
-# users' mailboxes that have been shared. Public namespaces are for shared
-# mailboxes that are managed by sysadmin. If you create any shared or public
-# namespaces you'll typically want to enable ACL plugin also, otherwise all
-# users can access all the shared mailboxes, assuming they have permissions
-# on filesystem level to do so.
-#
-# REMEMBER: If you add any namespaces, the default namespace must be added
-# explicitly, ie. mail_location does nothing unless you have a namespace
-# without a location setting. Default namespace is simply done by having a
-# namespace with empty prefix.
-#namespace private {
-   # Hierarchy separator to use. You should use the same separator for all
-   # namespaces or some clients get confused. '/' is usually a good one.
-   # The default however depends on the underlying mail storage format.
-   # separator = . 
-
-   # Prefix required to access this namespace. This needs to be different for
-   # all namespaces. For example "Public/".
-   # prefix = INBOX.
-
-   # Physical location of the mailbox. This is in same format as
-   # mail_location, which is also the default for it.
-   #location =
-
-   # There can be only one INBOX, and this setting defines which namespace
-   # has it.
-   #inbox = yes
-
-   # If namespace is hidden, it's not advertised to clients via NAMESPACE
-   # extension. You'll most likely also want to set list=no. This is mostly
-   # useful when converting from another server with different namespaces which
-   # you want to deprecate but still keep working. For example you can create
-   # hidden namespaces with prefixes "~/mail/", "~%u/mail/" and "mail/".
-   #hidden = yes
-
-   # Show the mailboxes under this namespace with LIST command. This makes the
-   # namespace visible for clients that don't support NAMESPACE extension.
-   # "children" value lists child mailboxes, but hides the namespace prefix.
-   #list = yes
-
-   # Namespace handles its own subscriptions. If set to "no", the parent
-   # namespace handles them (empty prefix should always have this as "yes")
-   #subscriptions = yes
-#}
-
-# Example shared namespace configuration
-#namespace shared {
-   #separator = /
-
-   # Mailboxes are visible under "shared/user@domain/"
-   # %%n, %%d and %%u are expanded to the destination user.
-   #prefix = shared/%%u/
-
-   # Mail location for other users' mailboxes. Note that %variables and ~/
-   # expands to the logged in user's data. %%n, %%d, %%u and %%h expand to the
-   # destination user's data.
-   #location = maildir:%%h/Maildir:INDEX=~/Maildir/shared/%%u
-
-   # Use the default namespace for saving subscriptions.
-   #subscriptions = no
-
-   # List the shared/ namespace only if there are visible shared mailboxes.
-   #list = children
-#}
-
-# System user and group used to access mails. If you use multiple, userdb
-# can override these by returning uid or gid fields. You can use either numbers
-# or names. </usr/share/doc/dovecot-common/wiki/UserIds.txt>
-#mail_uid =
-#mail_gid =
-
-# Group to enable temporarily for privileged operations. Currently this is
-# used only with INBOX when either its initial creation or dotlocking fails.
-# Typically this is set to "mail" to give access to /var/mail.
-#mail_privileged_group =
-mail_privileged_group = vmail
-
-# Grant access to these supplementary groups for mail processes. Typically
-# these are used to set up access to shared mailboxes. Note that it may be
-# dangerous to set these if users can create symlinks (e.g. if "mail" group is
-# set here, ln -s /var/mail ~/mail/var could allow a user to delete others'
-# mailboxes, or ln -s /secret/shared/box ~/mail/mybox would allow reading it).
-#mail_access_groups =
-
-# Allow full filesystem access to clients. There's no access checks other than
-# what the operating system does for the active UID/GID. It works with both
-# maildir and mboxes, allowing you to prefix mailboxes names with eg. /path/
-# or ~user/.
-#mail_full_filesystem_access = no
-
-##
-## Mail processes
-##
-
-# Enable mail process debugging. This can help you figure out why Dovecot
-# isn't finding your mails.
-#mail_debug = no
-
-# Log prefix for mail processes. See </usr/share/doc/dovecot-common/wiki/Variables.txt>
-# for list of possible variables you can use.
-#mail_log_prefix = "%Us(%u): "
-
-# Max. number of lines a mail process is allowed to log per second before it's
-# throttled. 0 means unlimited. Typically there's no need to change this
-# unless you're using mail_log plugin, which may log a lot. This setting is
-# ignored while mail_debug=yes to avoid pointless throttling.
-#mail_log_max_lines_per_sec = 10
-
-# Don't use mmap() at all. This is required if you store indexes to shared
-# filesystems (NFS or clustered filesystem).
-#mmap_disable = no
-
-# Rely on O_EXCL to work when creating dotlock files. NFS supports O_EXCL
-# since version 3, so this should be safe to use nowadays by default.
-#dotlock_use_excl = yes
-
-# Don't use fsync() or fdatasync() calls. This makes the performance better
-# at the cost of potential data loss if the server (or the file server)
-# goes down.
-#fsync_disable = no
-
-# Mail storage exists in NFS. Set this to yes to make Dovecot flush NFS caches
-# whenever needed. If you're using only a single mail server this isn't needed.
-#mail_nfs_storage = no
-# Mail index files also exist in NFS. Setting this to yes requires
-# mmap_disable=yes and fsync_disable=no.
-#mail_nfs_index = no
-
-# Locking method for index files. Alternatives are fcntl, flock and dotlock.
-# Dotlocking uses some tricks which may create more disk I/O than other locking
-# methods. NFS users: flock doesn't work, remember to change mmap_disable.
-#lock_method = fcntl
-
-# Drop all privileges before exec()ing the mail process. This is mostly
-# meant for debugging, otherwise you don't get core dumps. It could be a small
-# security risk if you use single UID for multiple users, as the users could
-# ptrace() each others processes then.
-#mail_drop_priv_before_exec = no
-
-# Show more verbose process titles (in ps). Currently shows user name and
-# IP address. Useful for seeing who are actually using the IMAP processes
-# (eg. shared mailboxes or if same uid is used for multiple accounts).
-#verbose_proctitle = no
-
-# Valid UID range for users, defaults to 500 and above. This is mostly
-# to make sure that users can't log in as daemons or other system users.
-# Note that denying root logins is hardcoded to dovecot binary and can't
-# be done even if first_valid_uid is set to 0.
-first_valid_uid = 2000
-last_valid_uid = 65000
-
-# Valid GID range for users, defaults to non-root/wheel. Users having
-# non-valid GID as primary group ID aren't allowed to log in. If user
-# belongs to supplementary groups with non-valid GIDs, those groups are
-# not set.
-#first_valid_gid = 1
-#last_valid_gid = 0
-
-# Maximum number of running mail processes. When this limit is reached,
-# new users aren't allowed to log in.
-#max_mail_processes = 512
-
-# Set max. process size in megabytes. Most of the memory goes to mmap()ing
-# files, so it shouldn't harm much even if this limit is set pretty high.
-#mail_process_size = 256
-
-# Maximum allowed length for mail keyword name. It's only forced when trying
-# to create new keywords.
-#mail_max_keyword_length = 50
-
-# ':' separated list of directories under which chrooting is allowed for mail
-# processes (ie. /var/mail will allow chrooting to /var/mail/foo/bar too).
-# This setting doesn't affect login_chroot, mail_chroot or auth chroot
-# settings. If this setting is empty, "/./" in home dirs are ignored.
-# WARNING: Never add directories here which local users can modify, that
-# may lead to root exploit. Usually this should be done only if you don't
-# allow shell access for users. </usr/share/doc/dovecot-common/wiki/Chrooting.txt>
-#valid_chroot_dirs = 
-
-# Default chroot directory for mail processes. This can be overridden for
-# specific users in user database by giving /./ in user's home directory
-# (eg. /home/./user chroots into /home). Note that usually there is no real
-# need to do chrooting, Dovecot doesn't allow users to access files outside
-# their mail directory anyway. If your home directories are prefixed with
-# the chroot directory, append "/." to mail_chroot. </usr/share/doc/dovecot-common/wiki/Chrooting.txt>
-#mail_chroot = 
-
-##
-## Mailbox handling optimizations
-##
-
-# The minimum number of mails in a mailbox before updates are done to cache
-# file. This allows optimizing Dovecot's behavior to do less disk writes at
-# the cost of more disk reads.
-#mail_cache_min_mail_count = 0
-
-# When IDLE command is running, mailbox is checked once in a while to see if
-# there are any new mails or other changes. This setting defines the minimum
-# time in seconds to wait between those checks. Dovecot can also use dnotify,
-# inotify and kqueue to find out immediately when changes occur.
-#mailbox_idle_check_interval = 30
-
-# Save mails with CR+LF instead of plain LF. This makes sending those mails
-# take less CPU, especially with sendfile() syscall with Linux and FreeBSD.
-# But it also creates a bit more disk I/O which may just make it slower.
-# Also note that if other software reads the mboxes/maildirs, they may handle
-# the extra CRs wrong and cause problems.
-#mail_save_crlf = no
-
-##
-## Maildir-specific settings
-##
-
-# By default LIST command returns all entries in maildir beginning with a dot.
-# Enabling this option makes Dovecot return only entries which are directories.
-# This is done by stat()ing each entry, so it causes more disk I/O.
-# (For systems setting struct dirent->d_type, this check is free and it's
-# done always regardless of this setting)
-#maildir_stat_dirs = no
-
-# When copying a message, do it with hard links whenever possible. This makes
-# the performance much better, and it's unlikely to have any side effects.
-#maildir_copy_with_hardlinks = yes
-
-# When copying a message, try to preserve the base filename. Only if the
-# destination mailbox already contains the same name (ie. the mail is being
-# copied there twice), a new name is given. The destination filename check is
-# done only by looking at dovecot-uidlist file, so if something outside
-# Dovecot does similar filename preserving copies, you may run into problems.
-# NOTE: This setting requires maildir_copy_with_hardlinks = yes to work.
-#maildir_copy_preserve_filename = no
-
-# Assume Dovecot is the only MUA accessing Maildir: Scan cur/ directory only
-# when its mtime changes unexpectedly or when we can't find the mail otherwise.
-#maildir_very_dirty_syncs = no
-
-##
-## mbox-specific settings
-##
-
-# Which locking methods to use for locking mbox. There are four available:
-#  dotlock: Create <mailbox>.lock file. This is the oldest and most NFS-safe
-#           solution. If you want to use /var/mail/ like directory, the users
-#           will need write access to that directory.
-#  dotlock_try: Same as dotlock, but if it fails because of permissions or
-#               because there isn't enough disk space, just skip it.
-#  fcntl  : Use this if possible. Works with NFS too if lockd is used.
-#  flock  : May not exist in all systems. Doesn't work with NFS.
-#  lockf  : May not exist in all systems. Doesn't work with NFS.
-#
-# You can use multiple locking methods; if you do the order they're declared
-# in is important to avoid deadlocks if other MTAs/MUAs are using multiple
-# locking methods as well. Some operating systems don't allow using some of
-# them simultaneously.
-#
-# The Debian value for mbox_write_locks differs from upstream Dovecot. It is
-# changed to be compliant with Debian Policy (section 11.6) for NFS safety.
-#       Dovecot: mbox_write_locks = dotlock fcntl
-#       Debian:  mbox_write_locks = fcntl dotlock
-#
-#mbox_read_locks = fcntl
-#mbox_write_locks = fcntl dotlock
-
-# Maximum time in seconds to wait for lock (all of them) before aborting.
-#mbox_lock_timeout = 300
-
-# If dotlock exists but the mailbox isn't modified in any way, override the
-# lock file after this many seconds.
-#mbox_dotlock_change_timeout = 120
-
-# When mbox changes unexpectedly we have to fully read it to find out what
-# changed. If the mbox is large this can take a long time. Since the change
-# is usually just a newly appended mail, it'd be faster to simply read the
-# new mails. If this setting is enabled, Dovecot does this but still safely
-# fallbacks to re-reading the whole mbox file whenever something in mbox isn't
-# how it's expected to be. The only real downside to this setting is that if
-# some other MUA changes message flags, Dovecot doesn't notice it immediately.
-# Note that a full sync is done with SELECT, EXAMINE, EXPUNGE and CHECK 
-# commands.
-#mbox_dirty_syncs = yes
-
-# Like mbox_dirty_syncs, but don't do full syncs even with SELECT, EXAMINE,
-# EXPUNGE or CHECK commands. If this is set, mbox_dirty_syncs is ignored.
-#mbox_very_dirty_syncs = no
-
-# Delay writing mbox headers until doing a full write sync (EXPUNGE and CHECK
-# commands and when closing the mailbox). This is especially useful for POP3
-# where clients often delete all mails. The downside is that our changes
-# aren't immediately visible to other MUAs.
-#mbox_lazy_writes = yes
-
-# If mbox size is smaller than this (in kilobytes), don't write index files.
-# If an index file already exists it's still read, just not updated.
-#mbox_min_index_size = 0
-
-##
-## dbox-specific settings
-##
-
-# Maximum dbox file size in kilobytes until it's rotated.
-#dbox_rotate_size = 2048
-
-# Minimum dbox file size in kilobytes before it's rotated
-# (overrides dbox_rotate_days)
-#dbox_rotate_min_size = 16
-
-# Maximum dbox file age in days until it's rotated. Day always begins from
-# midnight, so 1 = today, 2 = yesterday, etc. 0 = check disabled.
-#dbox_rotate_days = 0
-
-##
-## IMAP specific settings
-##
-
-protocol imap {
-  # Login executable location.
-  #login_executable = /usr/lib/dovecot/imap-login
-
-  # IMAP executable location. Changing this allows you to execute other
-  # binaries before the imap process is executed.
-  #
-  # This would write rawlogs into user's ~/dovecot.rawlog/, if it exists:
-  #   mail_executable = /usr/lib/dovecot/rawlog /usr/lib/dovecot/imap
-  # </usr/doc/dovecot-common/wiki/Debugging.Rawlog.txt>
-  #
-  # This would attach gdb into the imap process and write backtraces into
-  # /tmp/gdbhelper.* files:
-  #   mail_executable = /usr/lib/dovecot/gdbhelper /usr/lib/dovecot/imap
-  #
-  mail_executable = /usr/lib/alternc/popimap-log-login.sh /usr/lib/dovecot/imap
-
-  # Maximum IMAP command line length in bytes. Some clients generate very long
-  # command lines with huge mailboxes, so you may need to raise this if you get
-  # "Too long argument" or "IMAP command line too large" errors often.
-  #imap_max_line_length = 65536
-
-  # Maximum number of IMAP connections allowed for a user from each IP address.
-  # NOTE: The username is compared case-sensitively.
-  #mail_max_userip_connections = 10
-
-  # Support for dynamically loadable plugins. mail_plugins is a space separated
-  # list of plugins to load.
-  #mail_plugins = 
-  mail_plugins = quota imap_quota 
-  #mail_plugin_dir = /usr/lib/dovecot/modules/imap
-
-  # IMAP logout format string:
-  #  %i - total number of bytes read from client
-  #  %o - total number of bytes sent to client
-  #imap_logout_format = bytes=%i/%o
-
-  # Override the IMAP CAPABILITY response.
-  #imap_capability = 
-
-  # How many seconds to wait between "OK Still here" notifications when
-  # client is IDLEing.
-  #imap_idle_notify_interval = 120
-
-  # ID field names and values to send to clients. Using * as the value makes
-  # Dovecot use the default value. The following fields have default values
-  # currently: name, version, os, os-version, support-url, support-email.
-  #imap_id_send = 
-
-  # ID fields sent by client to log. * means everything.
-  #imap_id_log =
-
-  # Workarounds for various client bugs:
-  #   delay-newmail:
-  #     Send EXISTS/RECENT new mail notifications only when replying to NOOP
-  #     and CHECK commands. Some clients ignore them otherwise, for example OSX
-  #     Mail (<v2.1). Outlook Express breaks more badly though, without this it
-  #     may show user "Message no longer in server" errors. Note that OE6 still
-  #     breaks even with this workaround if synchronization is set to
-  #     "Headers Only".
-  #   netscape-eoh:
-  #     Netscape 4.x breaks if message headers don't end with the empty "end of
-  #     headers" line. Normally all messages have this, but setting this
-  #     workaround makes sure that Netscape never breaks by adding the line if
-  #     it doesn't exist. This is done only for FETCH BODY[HEADER.FIELDS..]
-  #     commands. Note that RFC says this shouldn't be done.
-  #   tb-extra-mailbox-sep:
-  #     With mbox storage a mailbox can contain either mails or submailboxes,
-  #     but not both. Thunderbird separates these two by forcing server to
-  #     accept '/' suffix in mailbox names in subscriptions list.
-  # The list is space-separated.
-  #imap_client_workarounds = 
-}
-  
-##
-## POP3 specific settings
-##
-
-protocol pop3 {
-  # Login executable location.
-  #login_executable = /usr/lib/dovecot/pop3-login
-
-  # POP3 executable location. See IMAP's mail_executable above for examples
-  # how this could be changed.
-  mail_executable = /usr/lib/alternc/popimap-log-login.sh /usr/lib/dovecot/pop3
-
-  # Don't try to set mails non-recent or seen with POP3 sessions. This is
-  # mostly intended to reduce disk I/O. With maildir it doesn't move files
-  # from new/ to cur/, with mbox it doesn't write Status-header.
-  #pop3_no_flag_updates = no
-
-  # Support LAST command which exists in old POP3 specs, but has been removed
-  # from new ones. Some clients still wish to use this though. Enabling this
-  # makes RSET command clear all \Seen flags from messages.
-  #pop3_enable_last = no
-
-  # If mail has X-UIDL header, use it as the mail's UIDL.
-  #pop3_reuse_xuidl = no
-
-  # Keep the mailbox locked for the entire POP3 session.
-  #pop3_lock_session = no
-
-  # POP3 UIDL (unique mail identifier) format to use. You can use following
-  # variables, along with the variable modifiers described in
-  # </usr/share/doc/dovecot-common/wiki/Variables.txt> (e.g. %Uf for the
-  # filename in uppercase)
-  #
-  #  %v - Mailbox's IMAP UIDVALIDITY
-  #  %u - Mail's IMAP UID
-  #  %m - MD5 sum of the mailbox headers in hex (mbox only)
-  #  %f - filename (maildir only)
-  #
-  # If you want UIDL compatibility with other POP3 servers, use:
-  #  UW's ipop3d         : %08Xv%08Xu
-  #  Courier             : %f or %v-%u (both might be used simultaneosly)
-  #  Cyrus (<= 2.1.3)    : %u
-  #  Cyrus (>= 2.1.4)    : %v.%u
-  #  Dovecot v0.99.x     : %v.%u
-  #  tpop3d              : %Mf
-  #
-  # Note that Outlook 2003 seems to have problems with %v.%u format which was
-  # Dovecot's default, so if you're building a new server it would be a good
-  # idea to change this. %08Xu%08Xv should be pretty fail-safe.
-  #
-  pop3_uidl_format = %08Xu%08Xv
-
-  # Permanently save UIDLs sent to POP3 clients, so pop3_uidl_format changes
-  # won't change those UIDLs. Currently this works only with Maildir.
-  #pop3_save_uidl = no
-
-  # POP3 logout format string:
-  #  %i - total number of bytes read from client
-  #  %o - total number of bytes sent to client
-  #  %t - number of TOP commands
-  #  %p - number of bytes sent to client as a result of TOP command
-  #  %r - number of RETR commands
-  #  %b - number of bytes sent to client as a result of RETR command
-  #  %d - number of deleted messages
-  #  %m - number of messages (before deletion)
-  #  %s - mailbox size in bytes (before deletion)
-  #pop3_logout_format = top=%t/%p, retr=%r/%b, del=%d/%m, size=%s
-
-  # Maximum number of POP3 connections allowed for a user from each IP address.
-  # NOTE: The username is compared case-sensitively.
-  #mail_max_userip_connections = 3
-
-  # Support for dynamically loadable plugins. mail_plugins is a space separated
-  # list of plugins to load.
-  #mail_plugins = 
-  mail_plugins = quota
-  #mail_plugin_dir = /usr/lib/dovecot/modules/pop3
-
-  # Workarounds for various client bugs:
-  #   outlook-no-nuls:
-  #     Outlook and Outlook Express hang if mails contain NUL characters.
-  #     This setting replaces them with 0x80 character.
-  #   oe-ns-eoh:
-  #     Outlook Express and Netscape Mail breaks if end of headers-line is
-  #     missing. This option simply sends it if it's missing.
-  # The list is space-separated.
-  #pop3_client_workarounds = 
-}
-
-##
-## ManageSieve specific settings
-##
-
-protocol managesieve {
-  # Login executable location.
-  #login_executable = /usr/lib/dovecot/managesieve-login
-
-  # ManageSieve executable location. See IMAP's mail_executable above for
-  # examples how this could be changed.
-  mail_executable = /usr/lib/dovecot/managesieve
-
-  # Maximum ManageSieve command line length in bytes. This setting is
-  # directly borrowed from IMAP. But, since long command lines are very
-  # unlikely with ManageSieve, changing this will not be very useful.
-  #managesieve_max_line_length = 65536
-
-  # ManageSieve logout format string:
-  #  %i - total number of bytes read from client
-  #  %o - total number of bytes sent to client
-  #managesieve_logout_format = bytes=%i/%o
-
-  # If, for some inobvious reason, the sieve_storage remains unset, the
-  # ManageSieve daemon uses the specification of the mail_location to find out
-  # where to store the sieve files (see explaination in README.managesieve).
-  # The example below, when uncommented, overrides any global mail_location
-  # specification and stores all the scripts in '~/mail/sieve' if sieve_storage
-  # is unset. However, you should always use the sieve_storage setting.
-  # mail_location = mbox:~/mail
-
-  # To fool ManageSieve clients that are focused on timesieved you can
-  # specify the IMPLEMENTATION capability that the dovecot reports to clients
-  # (default: "dovecot").
-  #managesieve_implementation_string = Cyrus timsieved v2.2.13
-}
-
-##
-## LDA specific settings
-##
-
-protocol lda {
-  # Address to use when sending rejection mails (e.g. postmaster@example.com).
-  postmaster_address = postmaster@localhost
-
-  # Hostname to use in various parts of sent mails, eg. in Message-Id.
-  # Default is the system's real hostname.
-  #hostname = 
-
-  # Support for dynamically loadable plugins. mail_plugins is a space separated
-  # list of plugins to load.
-  mail_plugins = quota sieve
-  #mail_plugin_dir = /usr/lib/dovecot/modules/lda
-
-  # If user is over quota, return with temporary failure instead of
-  # bouncing the mail.
-  #quota_full_tempfail = no
-
-  # Format to use for logging mail deliveries. You can use variables:
-  #  %$ - Delivery status message (e.g. "saved to INBOX")
-  #  %m - Message-ID
-  #  %s - Subject
-  #  %f - From address
-  #deliver_log_format = msgid=%m: %$
-
-  # Binary to use for sending mails.
-  #sendmail_path = /usr/sbin/sendmail
-
-  # Subject: header to use for rejection mails. You can use the same variables
-  # as for rejection_reason below.
-  #rejection_subject = Rejected: %s
-
-  # Human readable error message for rejection mails. You can use variables:
-  #  %n = CRLF, %r = reason, %s = original subject, %t = recipient
-  #rejection_reason = Your message to <%t> was automatically rejected:%n%r
-
-  # UNIX socket path to master authentication server to find users.
-  auth_socket_path = /var/run/dovecot/auth-master
-}
-
-##
-## Authentication processes
-##
-
-# Executable location
-#auth_executable = /usr/lib/dovecot/dovecot-auth
-
-# Set max. process size in megabytes.
-#auth_process_size = 256
-
-# Authentication cache size in kilobytes. 0 means it's disabled.
-# Note that bsdauth, PAM and vpopmail require cache_key to be set for caching
-# to be used.
-#auth_cache_size = 0
-# Time to live in seconds for cached data. After this many seconds the cached
-# record is no longer used, *except* if the main database lookup returns
-# internal failure. We also try to handle password changes automatically: If
-# user's previous authentication was successful, but this one wasn't, the
-# cache isn't used. For now this works only with plaintext authentication.
-#auth_cache_ttl = 3600
-# TTL for negative hits (user not found, password mismatch).
-# 0 disables caching them completely.
-#auth_cache_negative_ttl = 3600
-
-# Space separated list of realms for SASL authentication mechanisms that need
-# them. You can leave it empty if you don't want to support multiple realms.
-# Many clients simply use the first one listed here, so keep the default realm
-# first.
-#auth_realms =
-
-# Default realm/domain to use if none was specified. This is used for both
-# SASL realms and appending @domain to username in plaintext logins.
-#auth_default_realm = 
-
-# List of allowed characters in username. If the user-given username contains
-# a character not listed in here, the login automatically fails. This is just
-# an extra check to make sure user can't exploit any potential quote escaping
-# vulnerabilities with SQL/LDAP databases. If you want to allow all characters,
-# set this value to empty.
-#auth_username_chars = abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@
-
-# Username character translations before it's looked up from databases. The
-# value contains series of from -> to characters. For example "#@/@" means
-# that '#' and '/' characters are translated to '@'.
-#auth_username_translation =
-
-# Username formatting before it's looked up from databases. You can use
-# the standard variables here, eg. %Lu would lowercase the username, %n would
-# drop away the domain if it was given, or "%n-AT-%d" would change the '@' into
-# "-AT-". This translation is done after auth_username_translation changes.
-#auth_username_format =
-
-# If you want to allow master users to log in by specifying the master
-# username within the normal username string (ie. not using SASL mechanism's
-# support for it), you can specify the separator character here. The format
-# is then <username><separator><master username>. UW-IMAP uses "*" as the
-# separator, so that could be a good choice.
-#auth_master_user_separator =
-
-# Username to use for users logging in with ANONYMOUS SASL mechanism
-#auth_anonymous_username = anonymous
-
-# Log unsuccessful authentication attempts and the reasons why they failed.
-#auth_verbose = no
-
-# Even more verbose logging for debugging purposes. Shows for example SQL
-# queries.
-#auth_debug = no
-
-# In case of password mismatches, log the passwords and used scheme so the
-# problem can be debugged. Enabling this also enables auth_debug.
-#auth_debug_passwords = no
-
-# Maximum number of dovecot-auth worker processes. They're used to execute
-# blocking passdb and userdb queries (eg. MySQL and PAM). They're
-# automatically created and destroyed as needed.
-#auth_worker_max_count = 30
-
-# Host name to use in GSSAPI principal names. The default is to use the
-# name returned by gethostname(). Use "$ALL" to allow all keytab entries.
-#auth_gssapi_hostname =
-
-# Kerberos keytab to use for the GSSAPI mechanism. Will use the system 
-# default (usually /etc/krb5.keytab) if not specified.
-#auth_krb5_keytab = 
-
-# Do NTLM and GSS-SPNEGO authentication using Samba's winbind daemon and
-# ntlm_auth helper.
-# </usr/share/doc/dovecot-common/wiki/Authentication.Mechanisms.Winbind.txt>
-#auth_use_winbind = no
-
-# Path for Samba's ntlm_auth helper binary.
-#auth_winbind_helper_path = /usr/bin/ntlm_auth
-
-# Number of seconds to delay before replying to failed authentications.
-#auth_failure_delay = 2
-
-auth default {
-  # Space separated list of wanted authentication mechanisms:
-  #   plain login digest-md5 cram-md5 ntlm rpa apop anonymous gssapi otp skey
-  #   gss-spnego
-  # NOTE: See also disable_plaintext_auth setting.
-  mechanisms = plain login
-
-  #
-  # Password database is used to verify user's password (and nothing more).
-  # You can have multiple passdbs and userdbs. This is useful if you want to
-  # allow both system users (/etc/passwd) and virtual users to login without
-  # duplicating the system users into virtual database.
-  #
-  # </usr/share/doc/dovecot-common/wiki/PasswordDatabase.txt>
-  #
-  # By adding master=yes setting inside a passdb you make the passdb a list
-  # of "master users", who can log in as anyone else. Unless you're using PAM,
-  # you probably still want the destination user to be looked up from passdb
-  # that it really exists. This can be done by adding pass=yes setting to the
-  # master passdb. </usr/share/doc/dovecot-common/wiki/Authentication.MasterUsers.txt>
-
-  # Users can be temporarily disabled by adding a passdb with deny=yes.
-  # If the user is found from that database, authentication will fail.
-  # The deny passdb should always be specified before others, so it gets
-  # checked first. Here's an example:
-
-  #passdb passwd-file {
-    # File contains a list of usernames, one per line
-    #args = /etc/dovecot/dovecot.deny
-    #deny = yes
-  #}
-
-  # PAM authentication. Preferred nowadays by most systems. 
-  # Note that PAM can only be used to verify if user's password is correct,
-  # so it can't be used as userdb. If you don't want to use a separate user
-  # database (passwd usually), you can use static userdb.
-  # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM
-  # authentication to actually work. </usr/share/doc/dovecot-common/wiki/PasswordDatabase.PAM.txt>
-  #passdb pam {
-    # [session=yes] [setcred=yes] [failure_show_msg=yes] [max_requests=<n>]
-    # [cache_key=<key>] [<service name>]
-    #
-    # session=yes makes Dovecot open and immediately close PAM session. Some
-    # PAM plugins need this to work, such as pam_mkhomedir.
-    #
-    # setcred=yes makes Dovecot establish PAM credentials if some PAM plugins
-    # need that. They aren't ever deleted though, so this isn't enabled by
-    # default.
-    #
-    # max_requests specifies how many PAM lookups to do in one process before
-    # recreating the process. The default is 100, because many PAM plugins
-    # leak memory.
-    #
-    # cache_key can be used to enable authentication caching for PAM
-    # (auth_cache_size also needs to be set). It isn't enabled by default
-    # because PAM modules can do all kinds of checks besides checking password,
-    # such as checking IP address. Dovecot can't know about these checks
-    # without some help. cache_key is simply a list of variables (see
-    # /usr/share/doc/dovecot-common/wiki/Variables.txt) which must match
-    # for the cached data to be used.
-    # Here are some examples:
-    #   %u - Username must match. Probably sufficient for most uses.
-    #   %u%r - Username and remote IP address must match.
-    #   %u%s - Username and service (ie. IMAP, POP3) must match.
-    # 
-    # The service name can contain variables, for example %Ls expands to
-    # pop3 or imap.
-    #
-    # Some examples:
-    #   args = session=yes %Ls
-    #   args = cache_key=%u dovecot
-    #args = dovecot
-  #}
-
-  # System users (NSS, /etc/passwd, or similiar)
-  # In many systems nowadays this uses Name Service Switch, which is
-  # configured in /etc/nsswitch.conf. </usr/share/doc/dovecot-common/wiki/AuthDatabase.Passwd.txt>
-  #passdb passwd {
-    # [blocking=yes] - See userdb passwd for explanation
-    #args = 
-  #}
-
-  # Shadow passwords for system users (NSS, /etc/shadow or similiar).
-  # Deprecated by PAM nowadays.
-  # </usr/share/doc/dovecot-common/wiki/PasswordDatabase.Shadow.txt>
-  #passdb shadow {
-    # [blocking=yes] - See userdb passwd for explanation
-    #args = 
-  #}
-
-  # PAM-like authentication for OpenBSD.
-  # </usr/share/doc/dovecot-common/wiki/PasswordDatabase.BSDAuth.txt>
-  #passdb bsdauth {
-    # [cache_key=<key>] - See cache_key in PAM for explanation.
-    #args =
-  #}
-
-  # passwd-like file with specified location
-  # </usr/share/doc/dovecot-common/wiki/AuthDatabase.PasswdFile.txt>
-  #passdb passwd-file {
-    # [scheme=<default password scheme>] [username_format=<format>]
-    # <Path for passwd-file>
-    #args = 
-  #}
-
-  # checkpassword executable authentication
-  # NOTE: You will probably want to use "userdb prefetch" with this.
-  # </usr/share/doc/dovecot-common/wiki/AuthDatabase.CheckPassword.txt>
-  #passdb checkpassword {
-    # Path for checkpassword binary
-    #args = 
-  #}
-
-  # SQL database </usr/share/doc/dovecot-common/wiki/AuthDatabase.SQL.txt>
-  passdb sql {
-    # Path for SQL configuration file
-    args = /etc/dovecot/dovecot-sql.conf
-  }
-
-  # LDAP database </usr/share/doc/dovecot-common/wiki/AuthDatabase.LDAP.txt>
-  #passdb ldap {
-    # Path for LDAP configuration file
-    #args = /etc/dovecot/dovecot-ldap.conf
-  #}
-
-  # vpopmail authentication </usr/share/doc/dovecot-common/wiki/AuthDatabase.VPopMail.txt>
-  #passdb vpopmail {
-    # [cache_key=<key>] - See cache_key in PAM for explanation.
-    # [quota_template=<template>] - %q expands to Maildir++ quota
-    #   (eg. quota_template=quota_rule=*:backend=%q)
-    #args =
-  #}
-
-  #
-  # User database specifies where mails are located and what user/group IDs
-  # own them. For single-UID configuration use "static".
-  #
-  # </usr/share/doc/dovecot-common/wiki/UserDatabase.txt>
-  #
-
-  # "prefetch" user database means that the passdb already provided the
-  # needed information and there's no need to do a separate userdb lookup.
-  # This can be made to work with SQL and LDAP databases, see their example
-  # configuration files for more information how to do it.
-  # </usr/share/doc/dovecot-common/wiki/UserDatabase.Prefetch.txt>
-  userdb prefetch {
-  }
-
-  # System users (NSS, /etc/passwd, or similiar). In many systems nowadays this
-  # uses Name Service Switch, which is configured in /etc/nsswitch.conf.
-  # </usr/share/doc/dovecot-common/wiki/AuthDatabase.Passwd.txt>
-  #userdb passwd {
-    # [blocking=yes] - By default the lookups are done in the main dovecot-auth
-    # process. This setting causes the lookups to be done in auth worker
-    # proceses. Useful with remote NSS lookups that may block.
-    # NOTE: Be sure to use this setting with nss_ldap or users might get
-    # logged in as each others!
-    #args = 
-  #}
-
-  # passwd-like file with specified location
-  # </usr/share/doc/dovecot-common/wiki/AuthDatabase.PasswdFile.txt>
-  #userdb passwd-file {
-    # [username_format=<format>] <Path for passwd-file>
-    #args =
-  #}
-
-  # checkpassword executable user database lookup
-  # </usr/share/doc/dovecot-common/wiki/AuthDatabase.CheckPassword.txt>
-  #userdb checkpassword {
-    # Path for checkpassword binary
-    #args = 
-  #}
-
-  # static settings generated from template </usr/share/doc/dovecot-common/wiki/UserDatabase.Static.txt>
-  #userdb static {
-    # Template for the fields. Can return anything a userdb could normally
-    # return. For example:
-    #
-    #  args = uid=500 gid=500 home=/var/mail/%u
-    #
-    # If you use deliver, it needs to look up users only from the userdb. This
-    # of course doesn't work with static because there is no list of users.
-    # Normally static userdb handles this by doing a passdb lookup. This works
-    # with most passdbs, with PAM being the most notable exception. If you do
-    # the user verification another way, you can add allow_all_users=yes to
-    # the args in which case the passdb lookup is skipped.
-    #
-    #args =
-  #}
-
-  # SQL database </usr/share/doc/dovecot-common/wiki/AuthDatabase.SQL.txt>
-  userdb sql {
-    # Path for SQL configuration file
-    args = /etc/dovecot/dovecot-sql.conf
-  }
-
-  # LDAP database </usr/share/doc/dovecot-common/wiki/AuthDatabase.LDAP.txt>
-  #userdb ldap {
-    # Path for LDAP configuration file
-    #args = /etc/dovecot/dovecot-ldap.conf
-  #}
-
-  # vpopmail </usr/share/doc/dovecot-common/wiki/AuthDatabase.VPopMail.txt>
-  #userdb vpopmail {
-  #}
-
-  # User to use for the process. This user needs access to only user and
-  # password databases, nothing else. Only shadow and pam authentication
-  # requires roots, so use something else if possible. Note that passwd
-  # authentication with BSDs internally accesses shadow files, which also
-  # requires roots. Note that this user is NOT used to access mails.
-  # That user is specified by userdb above.
-  user = vmail
-
-  # Directory where to chroot the process. Most authentication backends don't
-  # work if this is set, and there's no point chrooting if auth_user is root.
-  # Note that valid_chroot_dirs isn't needed to use this setting.
-  #chroot = 
-
-  # Number of authentication processes to create
-  #count = 1
-
-  # Require a valid SSL client certificate or the authentication fails.
-  #ssl_require_client_cert = no
-
-  # Take the username from client's SSL certificate, using 
-  # X509_NAME_get_text_by_NID() which returns the subject's DN's
-  # CommonName. 
-  #ssl_username_from_cert = no
-
-  # It's possible to export the authentication interface to other programs:
-  socket listen {
-    master {
-      # Master socket provides access to userdb information. It's typically
-      # used to give Dovecot's local delivery agent access to userdb so it
-      # can find mailbox locations.
-      path = /var/run/dovecot/auth-master
-      mode = 0600
-      # Default user/group is the one who started dovecot-auth (root)
-      user = vmail
-      #group = 
-    }
-    client {
-      # The client socket is generally safe to export to everyone. Typical use
-      # is to export it to your SMTP server so it can do SMTP AUTH lookups
-      # using it.
-      path = /var/spool/postfix/private/auth
-      mode = 0660
-      user = postfix
-      group = postfix
-    }
-  }
-}
-
-# If you wish to use another authentication server than dovecot-auth, you can
-# use connect sockets. They are assumed to be already running, Dovecot's master
-# process only tries to connect to them. They don't need any other settings
-# than the path for the master socket, as the configuration is done elsewhere.
-# Note that the client sockets must exist in the login_dir.
-#auth external {
-#  socket connect {
-#    master {
-#      path = /var/run/dovecot/auth-master
-#    }
-#  }
-#}
-
-##
-## Dictionary server settings
-##
-
-# Dictionary can be used by some plugins to store key=value lists, such as
-# quota, expire and acl plugins. The dictionary can be used either directly or
-# though a dictionary server. The following dict block maps dictionary names to
-# URIs when the server is used. These can then be referenced using URIs in
-# format "proxy::<name>".
-
-dict {
-  quotadict = mysql:/etc/dovecot/dovecot-dict-quota.conf
-  #expire = db:/var/lib/dovecot/expire.db
-}
-
-# Path to Berkeley DB's configuration file. See doc/dovecot-db-example.conf
-#dict_db_config = 
-
-##
-## Plugin settings
-##
-
-plugin {
-  # Here you can give some extra environment variables to mail processes.
-  # This is mostly meant for passing parameters to plugins. %variable
-  # expansion is done for all values.
-
-  # Quota plugin. Multiple backends are supported:
-  #   dirsize: Find and sum all the files found from mail directory.
-  #            Extremely SLOW with Maildir. It'll eat your CPU and disk I/O.
-  #   dict: Keep quota stored in dictionary (eg. SQL)
-  #   maildir: Maildir++ quota
-  #   fs: Read-only support for filesystem quota
-  #
-  # Quota limits are set using "quota_rule" parameters, either in here or in
-  # userdb. It's also possible to give mailbox-specific limits, for example:
-  #   quota_rule = *:storage=1048576
-     quota_rule = *:storage=100M
-     quota_rule2 = Trash:storage=10%%
-  #   quota_rule2 = Trash:storage=102400
-  # User has now 1GB quota, but when saving to Trash mailbox the user gets
-  # additional 100MB.
-  #
-  # Multiple quota roots are also possible, for example:
-  #   quota = dict:user::proxy::quota
-  #   quota2 = dict:domain:%d:proxy::quota_domain
-  #   quota_rule = *:storage=102400
-  #   quota2_rule = *:storage=1048576
-  # Gives each user their own 100MB quota and one shared 1GB quota within
-  # the domain.
-  #
-  # You can execute a given command when user exceeds a specified quota limit.
-  # Each quota root has separate limits. Only the command for the first
-  # exceeded limit is excecuted, so put the highest limit first.
-  # Note that % needs to be escaped as %%, otherwise "% " expands to empty.
-  #   quota_warning = storage=95%% /usr/local/bin/quota-warning.sh 95
-  #   quota_warning2 = storage=80%% /usr/local/bin/quota-warning.sh 80
-     quota_warning = storage=95%% /usr/lib/alternc/quota-warning.sh 95
-     quota_warning2 = storage=80%% /usr/lib/alternc/quota-warning.sh 80
-  #quota = maildir
-  quota = dict:user::proxy::quotadict
-
-  # ACL plugin. vfile backend reads ACLs from "dovecot-acl" file from maildir
-  # directory. You can also optionally give a global ACL directory path where
-  # ACLs are applied to all users' mailboxes. The global ACL directory contains
-  # one file for each mailbox, eg. INBOX or sub.mailbox. cache_secs parameter
-  # specifies how many seconds to wait between stat()ing dovecot-acl file
-  # to see if it changed.
-  #acl = vfile:/etc/dovecot/dovecot-acls:cache_secs=300
-
-  # To let users LIST mailboxes shared by other users, Dovecot needs a
-  # shared mailbox dictionary. For example:
-  #acl_shared_dict = file:/var/lib/dovecot/shared-mailboxes
-
-  # Convert plugin. If set, specifies the source storage path which is
-  # converted to destination storage (mail_location) when the user logs in.
-  # The existing mail directory is renamed to <dir>-converted.
-  #convert_mail = mbox:%h/mail
-  # Skip mailboxes which we can't open successfully instead of aborting.
-  #convert_skip_broken_mailboxes = no
-  # Skip directories beginning with '.'
-  #convert_skip_dotdirs = no
-  # If source storage has mailbox names with destination storage's hierarchy
-  # separators, replace them with this character.
-  #convert_alt_hierarchy_char = _
-
-  # Trash plugin. When saving a message would make user go over quota, this
-  # plugin automatically deletes the oldest mails from configured mailboxes
-  # until the message can be saved within quota limits. The configuration file
-  # is a text file where each line is in format: <priority> <mailbox name>
-  # Mails are first deleted in lowest -> highest priority number order
-  #trash = /etc/dovecot/dovecot-trash.conf
-
-  # Expire plugin. Mails are expunged from mailboxes after being there the
-  # configurable time. The first expiration date for each mailbox is stored in
-  # a dictionary so it can be quickly determined which mailboxes contain
-  # expired mails. The actual expunging is done in a nightly cronjob, which
-  # you must set up:
-  #   dovecot --exec-mail ext /usr/lib/dovecot/expire-tool.sh
-  #expire = Trash 7 Spam 30
-  #expire_dict = proxy::expire
-
-  # Lazy expunge plugin. Currently works only with maildirs. When a user
-  # expunges mails, the mails are moved to a mailbox in another namespace
-  # (1st). When a mailbox is deleted, the mailbox is moved to another namespace
-  # (2nd) as well. Also if the deleted mailbox had any expunged messages,
-  # they're moved to a 3rd namespace. The mails won't be counted in quota,
-  # and they're not deleted automatically (use a cronjob or something).
-  #lazy_expunge = .EXPUNGED/ .DELETED/ .DELETED/.EXPUNGED/
-
-  # Events to log. Also available: flag_change append
-  #mail_log_events = delete undelete expunge copy mailbox_delete mailbox_rename
-  # Group events within a transaction to one line.
-  #mail_log_group_events = no
-  # Available fields: uid, box, msgid, from, subject, size, vsize, flags
-  # size and vsize are available only for expunge and copy events.
-  #mail_log_fields = uid box msgid size
-
-  # Sieve plugin (http://wiki.dovecot.org/LDA/Sieve) and ManageSieve service
-  #
-  # Location of the active script. When ManageSieve is used this is actually
-  # a symlink pointing to the active script in the sieve storage directory.
-  sieve=~/.dovecot.sieve
-  #
-  # The path to the directory where the personal Sieve scripts are stored. For
-  # ManageSieve this is where the uploaded scripts are stored.
-  sieve_dir=~/sieve
-}
-
-# Config files can also be included. deliver doesn't support them currently.
-#!include /etc/dovecot/conf.d/*.conf
-# Optional configurations, don't give an error if it's not found:
-#!include_try /etc/dovecot/extra.conf
diff --git a/install/alternc.install b/install/alternc.install
index 10bcbacc..95060b7c 100644
--- a/install/alternc.install
+++ b/install/alternc.install
@@ -79,7 +79,7 @@ if [ -e /etc/default/saslauthd ]; then
 fi
 
 if [ -e /etc/dovecot/dovecot.conf ]; then
-    CONFIG_FILES="$CONFIG_FILES etc/dovecot/dovecot.conf etc/dovecot/dovecot-sql.conf etc/dovecot/dovecot-dict-quota.conf"
+    CONFIG_FILES="$CONFIG_FILES etc/dovecot/alternc-sql.conf etc/dovecot/alternc-dict-quota.conf etc/dovecot/conf.d/95_alternc.conf"
 fi
 
 INSTALLED_CONFIG_TAR="/var/lib/alternc/backups/etc-installed.tar.gz"
@@ -279,12 +279,20 @@ rm -f $SED_SCRIPT
 # Ad-hoc fixes
 #
 
-php="`ls /usr/lib/apache*/*/*php*.so | sed -e 's/^.*libphp\(.\)\.so$/php\1/' | tail -1`"
-ln -fs /etc/alternc/alternc.ini /etc/$php/apache2/conf.d/alternc.ini || true
-ln -fs /etc/alternc/alternc.ini /etc/$php/cli/conf.d/alternc.ini || true
+php="`ls /usr/lib/apache*/*/*php*.so | sed -e 's/^.*libphp\(.*\)\.so$/\1/' | tail -1`"
+if [ "$php" = "7.0" ]
+then
+    ln -fs /etc/alternc/alternc.ini /etc/php/$php/apache2/conf.d/alternc.ini || true
+    ln -fs /etc/alternc/alternc.ini /etc/php/$php/cli/conf.d/alternc.ini || true
+else
+    ln -fs /etc/alternc/alternc.ini /etc/php$php/apache2/conf.d/alternc.ini || true
+    ln -fs /etc/alternc/alternc.ini /etc/php$php/cli/conf.d/alternc.ini || true
+fi
+
 if [ -x /usr/sbin/apache2 ]; then
     # hook 
     run-parts --arg=apache2 /usr/lib/alternc/install.d 
+    a2enmod mpm_itk
     
     s=""
     # unused from AlternC 1.0, FIXME: remove it later
@@ -293,9 +301,9 @@ if [ -x /usr/sbin/apache2 ]; then
         a2dismod vhost_alias
         s="apache2"
     fi 
-    if ! [ -L /etc/apache2/mods-enabled/$php.load ]
+    if ! [ -L /etc/apache2/mods-enabled/php$php.load ]
     then
-	    a2enmod $php
+	    a2enmod php$php
     fi
     if ! [ -L /etc/apache2/mods-enabled/rewrite.load ]
     then
@@ -311,13 +319,14 @@ if [ -x /usr/sbin/apache2 ]; then
             a2enmod ssl
             s="apache2"
         fi
-        if [ ! -h /etc/apache2/conf.d/alternc-ssl.conf ] && [ -e /etc/apache2/conf.d/ ]; then
-            ln -sf /etc/alternc/apache2-ssl.conf /etc/apache2/conf.d/alternc-ssl.conf
+        if [ ! -h /etc/apache2/conf-available/alternc-ssl.conf ] && [ -e /etc/apache2/conf-available/ ]; then
+            ln -sf /etc/alternc/apache2-ssl.conf /etc/apache2/conf-available/alternc-ssl.conf
+	    a2enconf alternc-ssl
             s="apache2"
         fi
 
 	# We enable dovecot SSL certificate instructions: (on wheezy we should use a new file in /etc/dovecot/conf.d/ )
-	sed -i -e 's#^ssl_cert_file.*$#ssl_cert_file = /etc/ssl/certs/ssl-cert-snakeoil.pem#' -e 's#^ssl_key_file.*$#ssl_key_file = /etc/ssl/private/ssl-cert-snakeoil.key#' /etc/dovecot/dovecot.conf
+	( echo "# Don't change this file, it will be overwriten by alternc.install. Change ssl parameters in a file named 99_ssl.conf instead" ; echo "ssl_cert = </etc/alternc/apache.pem" ; echo "ssl_key = </etc/alternc/apache.pem" ) >/etc/dovecot/conf.d/96_ssl.conf
 
     else
         # We disable proftpd tls module
@@ -326,17 +335,18 @@ if [ -x /usr/sbin/apache2 ]; then
         cp /etc/proftpd/modules.conf /etc/alternc/templates/proftpd/
 
 	# We disable dovecot SSL certificate instructions: (on wheezy we should remove a file in /etc/dovecot/conf.d/ )
-        sed -i -e 's#^ssl_cert_file.*$#ssl_cert_file = /etc/ssl/certs/ssl-cert-snakeoil.pem#' -e 's#^ssl_key_file.*$#ssl_key_file = /etc/ssl/private/ssl-cert-snakeoil.key#' /etc/dovecot/dovecot.conf
+	( echo "# Don't change this file, it will be overwriten by alternc.install. Change ssl parameters in a file named 99_ssl.conf instead" ; echo "ssl_cert = </etc/ssl/certs/ssl-cert-snakeoil.pem" ; echo "ssl_key = </etc/ssl/private/ssl-cert-snakeoil.key" ) >/etc/dovecot/conf.d/96_ssl.conf
 
         echo "SSL not configured"
         echo "create a certificate in /etc/alternc/apache.pem and rerun alternc.install"
     fi
-    if [ ! -h /etc/apache2/conf.d/alternc.conf ] && [ -e /etc/apache2/conf.d/ ]; then
-        ln -sf /etc/alternc/apache2.conf /etc/apache2/conf.d/alternc.conf
+    if [ ! -h /etc/apache2/conf-available/alternc.conf ] && [ -e /etc/apache2/conf-available/ ]; then
+        ln -sf /etc/alternc/apache2.conf /etc/apache2/conf-available/alternc.conf
+	a2enconf alternc.conf
         s="apache2"
     fi
-    if [ -e /etc/apache2/sites-enabled/000-default ]; then
-        a2dissite default
+    if [ -e /etc/apache2/sites-enabled/000-default.conf ]; then
+        a2dissite 000-default
         s="apache2"
     fi
     SERVICES="$SERVICES $s"
@@ -430,7 +440,7 @@ OLDDESTINATION=`postconf mydestination | awk -F '=' '{print $2}'`
 echo "$OLDDESTINATION" | grep -q -v "$FQDN" && postconf -e "mydestination = $FQDN, $OLDDESTINATION"
 
 # Remove phpmyadmin apache2 configuration
-rm -f /etc/apache2/conf.d/phpmyadmin.conf || true
+a2disconf phpmyadmin
 
 # Configure PHPMyAdmin
 include_str='include("/etc/alternc/phpmyadmin.inc.php")'
@@ -582,9 +592,14 @@ else
     mysql --defaults-file=/etc/alternc/my.cnf -e "UPDATE db_servers SET host='$MYSQL_HOST', login='$MYSQL_USER', password='$MYSQL_PASS', client='$MYSQL_HOST_CLIENT' WHERE name='Default';"
 fi
 
-#giving vmail user read access on dovecot sql file
-chgrp vmail /etc/dovecot/dovecot.conf
-chmod g+r /etc/dovecot/dovecot.conf
+# giving vmail user read access on dovecot sql file
+chgrp vmail /etc/dovecot/alternc-sql.conf
+chmod g+r /etc/dovecot/alternc-sql.conf
+# Override some dovecot 2.0 configuration that may have happened during dovecot postinst:
+sed -i -e 's/^ *!include/#!include/' /etc/dovecot/conf.d/10-auth.conf
+
+# Changing owner of web panel's files
+chown -R alterncpanel:alterncpanel "/usr/share/alternc/panel/"
 
 # We force the re-computing of the DNS zones, since we may have changed the IP address (see #460)
 /usr/bin/mysql --defaults-file="/etc/alternc/my.cnf" -B -e "update domaines set dns_action='UPDATE' WHERE gesdns=1;"
@@ -597,7 +612,7 @@ grep -q "^localhost\$" /etc/opendkim/TrustedHosts || echo "localhost" >>/etc/ope
 grep -q "^$PUBLIC_IP\$" /etc/opendkim/TrustedHosts || echo "$PUBLIC_IP" >>/etc/opendkim/TrustedHosts
 
 # Add opendkim to service to restart
-SERVICES="$SERVICES opendkim"
+SERVICES="$SERVICES opendkim bind9"
 
 # hook 
 run-parts --arg=before-reload /usr/lib/alternc/install.d 
@@ -605,7 +620,7 @@ run-parts --arg=before-reload /usr/lib/alternc/install.d
 #######################################################################
 # Reload services
 #
-for service in postfix bind9 apache2 dovecot cron proftpd ; do
+for service in postfix dovecot cron proftpd ; do
     invoke-rc.d $service force-reload || true
 done
 
@@ -613,6 +628,10 @@ done
 for service in $SERVICES; do
     test -x /etc/init.d/$service && invoke-rc.d $service stop || true
 done
+
+# on Jessie, apache2 does not stop/start properly due to "service" and "apache2ctl" having different behavior pid-file-wise
+killall apache2 
+
 for service in $SERVICES; do
     test -x /etc/init.d/$service && invoke-rc.d $service start || true
 done
diff --git a/install/alternc.install.orig b/install/alternc.install.orig
new file mode 100644
index 00000000..10bcbacc
--- /dev/null
+++ b/install/alternc.install.orig
@@ -0,0 +1,647 @@
+#!/bin/bash
+
+# ----------------------------------------------------------------------
+# AlternC - Web Hosting System
+# Copyright (C) 2000-2012 by the AlternC Development Team.
+# https://alternc.org/
+# ----------------------------------------------------------------------
+# LICENSE
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License (GPL)
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# To read the license please visit http://www.gnu.org/copyleft/gpl.html
+# ----------------------------------------------------------------------
+# Purpose of file: Main install script, launch it anytime ;) 
+# ----------------------------------------------------------------------
+
+# Somes check before start operations
+if [ `id -u` -ne 0 ]; then
+    echo "must be launched as root"
+    exit 1
+fi
+
+for i in $*; do
+    case "$i" in
+        -f|--force)
+            export force=1; shift;;
+        -s|--slave)
+            export slave=1; shift;;
+        --)
+            break;;
+        *)
+            echo "unknown option $i"; shift;;
+    esac
+done
+
+. /usr/lib/alternc/functions.sh
+
+# Lock the jobs !
+lock_jobs
+
+# hook 
+run-parts --arg=startup /usr/lib/alternc/install.d 
+
+#######################################################################
+# Script configuration
+#
+
+# Configuration template location
+TEMPLATE_DIR="/etc/alternc/templates"
+
+# Find needed configuration files (without the initial '/')
+# replace this one unconditionnally
+CONFIG_FILES="etc/alternc/bureau.conf etc/apache2/envvars etc/alternc/apache2.conf etc/alternc/apache_logformat.conf etc/alternc/phpmyadmin.inc.php"
+
+if [ -e /etc/bind/named.conf ]; then
+    CONFIG_FILES="$CONFIG_FILES etc/bind/named.conf.options"
+fi
+if [ -d /etc/postfix ]; then
+    CONFIG_FILES="$CONFIG_FILES etc/postfix/master.cf etc/postfix/myalias.cf etc/postfix/myrelay.cf
+                  etc/postfix/mydomain.cf etc/postfix/myrelay-domain.cf etc/postfix/mymail2mail.cf etc/postfix/mygid.cf etc/postfix/myquota.cf
+                  etc/postfix/myvirtual.cf etc/postfix/mytransport.cf etc/postfix/sasl/smtpd.conf
+                  etc/alternc/postfix/postfix.cf etc/alternc/postfix/postfix-slave.cf
+                  etc/opendkim.conf etc/default/opendkim"
+fi
+if [ -e /etc/proftpd/proftpd.conf ]; then
+    CONFIG_FILES="$CONFIG_FILES etc/proftpd/proftpd.conf etc/proftpd/welcome.msg etc/proftpd/modules.conf"
+fi
+
+if [ -e /etc/default/saslauthd ]; then
+    CONFIG_FILES="$CONFIG_FILES etc/default/saslauthd"
+fi
+
+if [ -e /etc/dovecot/dovecot.conf ]; then
+    CONFIG_FILES="$CONFIG_FILES etc/dovecot/dovecot.conf etc/dovecot/dovecot-sql.conf etc/dovecot/dovecot-dict-quota.conf"
+fi
+
+INSTALLED_CONFIG_TAR="/var/lib/alternc/backups/etc-installed.tar.gz"
+
+#######################################################################
+# Look for modified configuration files
+#
+if [ -f "$INSTALLED_CONFIG_TAR" ]; then
+    CHANGED="`env LANG=C tar -zdf "$INSTALLED_CONFIG_TAR" -C / 2> /dev/null | 
+              grep -v 'postfix/main.cf' | grep -v 'Uid differs'|grep -v 'Gid differs'  |grep -v 'Mode differs' | 
+              sed -e 's#^\([^:]*\).*#    /\1#' | sort -u`"
+    if [ ! -z "$CHANGED" ]; then
+        echo "The following configuration files has changed since last AlternC"
+        echo "installation :"
+        echo "$CHANGED"
+        echo ""
+        if [ "$force" = "1" ]; then
+            echo "Replacing them as you requested."
+        else
+            echo "These configuration files should normally be modified by"
+            echo "changing the template in $TEMPLATE_DIR and then calling"
+            echo "$0 to perform the update."
+            echo ""
+            echo "Please examine the situation closely and call '$0 -f'"
+            echo "if you still want to actually overwrite these files."
+            exit 1
+        fi
+    fi
+fi
+
+# Upgrade the DATA and DB SCHEMA
+/usr/share/alternc/install/upgrade_check.sh
+# Launch upgrade of alternc modules 
+run-parts --arg=upgrade /usr/lib/alternc/install.d
+
+
+#######################################################################
+# Prepare template expansions
+#
+
+chown :alterncpanel /etc/alternc/local.sh
+. /etc/alternc/local.sh
+
+# May be missing 
+test -d /var/run/alternc || ( mkdir -p /var/run/alternc && chown alterncpanel:alterncpanel /var/run/alternc )
+
+# Create the target directory
+for i in "$ALTERNC_HTML" "$ALTERNC_MAIL" "$ALTERNC_LOGS" ; do
+  test -d "$i" || mkdir -p "$i"
+done
+
+for i in a b c d e f g h i j k l m n o p q r s t u v w x y z _ 0 1 2 3 4 5 6 7 8 9; do
+  test -d "$ALTERNC_HTML/$i" || ( mkdir -p "$ALTERNC_HTML/$i" && chown alterncpanel:alterncpanel "$ALTERNC_HTML/$i" && chmod 775 "$ALTERNC_HTML/$i" )
+  test -d "$ALTERNC_MAIL/$i" || ( mkdir -p "$ALTERNC_MAIL/$i" && chown vmail:vmail "$ALTERNC_MAIL/$i" && chmod 775 "$ALTERNC_MAIL/$i" )
+done
+
+find $ALTERNC_LOGS -maxdepth 1 -type d -exec chown alterncpanel:adm {} \; 
+find $ALTERNC_HTML -maxdepth 1 -type d -exec chown alterncpanel:alterncpanel {} \; 
+find $ALTERNC_MAIL -maxdepth 1 -type d -exec chown vmail:vmail {} \;
+
+# Check ACL
+aclcheckfile="$ALTERNC_HTML/test-acl"
+touch "$aclcheckfile"
+setfacl -m u:root:rwx "$aclcheckfile" 2>/dev/null || ( echo "Error : ACL aren't activated on $ALTERNC_HTML . AlternC can't work without it." ; test -e "$aclcheckfile" && rm -f "$aclcheckfile" ; exit 2)
+test -e "$aclcheckfile" && rm -f "$aclcheckfile"
+
+# XXX: copy-paste from debian/config
+if [ -r /etc/alternc/my.cnf ]; then
+    # make mysql configuration available as shell variables
+    # to convert from .cnf to shell syntax, we:
+    # * match only lines with "equal" in them (/=/)
+    # * remove whitespace around the = and add a left quote operator ' (;s)
+    # * add a right quote operator at the end of line (;s)
+    # * convert mysql variables into our MYSQL_ naming convention (;s)
+    # * print the result (;p)
+    eval `sed -n -e "/=/{s/ *= *\"\?/='/;s/\"\?\$/'/;s/host/MYSQL_HOST/;s/user/MYSQL_USER/;s/password/MYSQL_PASS/;s/database/MYSQL_DATABASE/;p}" /etc/alternc/my.cnf`
+    chown root:alterncpanel /etc/alternc/my.cnf
+    chmod 640 /etc/alternc/my.cnf
+fi
+
+if [ -r /etc/alternc/my_mail.cnf ]; then
+    # make mysql configuration available as shell variables
+    # to convert from .cnf to shell syntax, we:
+    # * match only lines with "equal" in them (/=/)
+    # * remove whitespace around the = and add a left quote operator ' (;s)
+    # * add a right quote operator at the end of line (;s)
+    # * convert mysql variables into our MYSQL_ naming convention (;s)
+    # * print the result (;p)
+    eval `sed -n -e "/=/{s/ *= *\"\?/='/;s/\"\?\$/'/;s/host/MYSQL_HOST/;s/user/MYSQL_MAIL_USER/;s/password/MYSQL_MAIL_PASS/;s/database/MYSQL_DATABASE/;p}" /etc/alternc/my_mail.cnf`
+    chown root:alterncpanel /etc/alternc/my_mail.cnf
+    chmod 640 /etc/alternc/my_mail.cnf
+fi
+
+WARNING="WARNING: Do not edit this file, edit the one in /etc/alternc/templates and launch alternc.install again."
+
+if [ "$slave" = "1" ]; then
+    VERSION="`dpkg -s alternc-slave | sed -n -e 's/^Version: \(.*\)/\1/p'`"
+else
+    VERSION="`dpkg -s alternc | sed -n -e 's/^Version: \(.*\)/\1/p'`"
+fi
+
+# /var/ alternc/dns/d/www.example.com
+FQDN_LETTER="`echo $FQDN | sed -e 's/.*\.\([^\.]\)[^\.]*\.[^\.]*$/\1/'`"
+if [ "$FQDN_LETTER" = "$FQDN" ] 
+then
+       FQDN_LETTER="_" 
+fi
+
+NS2_IP=`perl -e "\\$h = (gethostbyname(\"$NS2_HOSTNAME\"))[4];
+                 @ip = unpack('C4', \\$h);
+                 print join (\".\", @ip);"`
+
+if [ -z "$MONITOR_IP" ]; then
+    MONITOR_IP="127.0.0.1"
+fi
+
+PUBLIC_IP_BEGIN=$(echo $PUBLIC_IP|cut -c 1)
+
+# Secret for PhpMyAdmin sessions
+PHPMYADMIN_BLOWFISH="$(generate_string 24)"
+
+# XXX: I assume this is secure if /tmp is sticky (+t)
+# we should have a better way to deal with templating, of course.
+SED_SCRIPT="/tmp/alternc.install.sedscript"
+cat > $SED_SCRIPT <<EOF
+s\\%%hosting%%\\$HOSTING\\;
+s\\%%fqdn%%\\$FQDN\\;
+s\\%%public_ip%%\\$PUBLIC_IP\\;
+s\\%%public_ip_begin%%\\$PUBLIC_IP_BEGIN\\;
+s\\%%internal_ip%%\\$INTERNAL_IP\\;
+s\\%%monitor_ip%%\\$MONITOR_IP\\;
+s\\%%ns1%%\\$NS1_HOSTNAME\\;
+s\\%%ns2%%\\$NS2_HOSTNAME\\;
+s\\%%mx%%\\$DEFAULT_MX\\;
+s\\%%dbhost%%\\$MYSQL_HOST\\;
+s\\%%dbname%%\\$MYSQL_DATABASE\\;
+s\\%%dbuser%%\\$MYSQL_USER\\;
+s\\%%dbpwd%%\\$MYSQL_PASS\\;
+s\\%%db_mail_user%%\\$MYSQL_MAIL_USER\\;
+s\\%%db_mail_pwd%%\\$MYSQL_MAIL_PASS\\;
+s\\%%warning_message%%\\$WARNING\\;
+s\\%%fqdn_lettre%%\\$FQDN_LETTER\\;
+s\\%%version%%\\$VERSION\\;
+s\\%%ns2_ip%%\\$NS2_IP\\;
+s\\%%ALTERNC_HTML%%\\$ALTERNC_HTML\\;
+s\\%%ALTERNC_MAIL%%\\$ALTERNC_MAIL\\;
+s\\%%ALTERNC_LOGS%%\\$ALTERNC_LOGS\\;
+s\\%%PHPMYADMIN_BLOWFISH%%\\$PHPMYADMIN_BLOWFISH\\;
+EOF
+
+# hook 
+test -d /usr/lib/alternc/install.d || mkdir -p /usr/lib/alternc/install.d
+run-parts --arg=templates /usr/lib/alternc/install.d 
+
+
+######################################################################
+# Backup the Main database
+DB_BACKUP="/var/lib/alternc/backups/${MYSQL_DATABASE}-db-`date +%Y%m%d-%H:%M:%S`.gz"
+db_dump="mysqldump --defaults-file=/etc/alternc/my.cnf --add-drop-table --allow-keywords --quote-names --force --quick --add-locks --lock-tables --extended-insert ${MYSQL_DATABASE}"
+$db_dump | /bin/gzip -c > $DB_BACKUP || echo "backup of the main database failed"
+
+#######################################################################
+# Backup configuration files
+#
+BACKUP_FILE="/var/lib/alternc/backups/etc-original-`date +%Y%m%d-%H%M`.tar.gz"
+
+# Only backup what we are really going to replace
+BACKUPS=""
+for file in $CONFIG_FILES; do
+    TEMPLATE="$TEMPLATE_DIR/${file##etc/}"
+    if [ -f "$TEMPLATE" ]; then
+        BACKUPS="$BACKUPS $file"
+    fi
+done
+
+# also backup main.cf since we're doing major changes to it
+BACKUPS="$BACKUPS etc/postfix/main.cf"
+
+tar -zcf "$BACKUP_FILE" -C / $BACKUPS 2>/dev/null || true
+chmod 600 "$BACKUP_FILE"
+
+#######################################################################
+# Expand templates in the right place
+#
+echo -n "Expanding variables in configuration files:"
+for file in $CONFIG_FILES; do
+    TEMPLATE="$TEMPLATE_DIR/${file##etc/}"
+    echo -n " $file"
+    if [ -f "$TEMPLATE" ]; then
+        sed -f "$SED_SCRIPT" < $TEMPLATE > /$file
+    fi
+done
+echo "."
+rm -f $SED_SCRIPT
+
+######################################################################## 
+# Ad-hoc fixes
+#
+
+php="`ls /usr/lib/apache*/*/*php*.so | sed -e 's/^.*libphp\(.\)\.so$/php\1/' | tail -1`"
+ln -fs /etc/alternc/alternc.ini /etc/$php/apache2/conf.d/alternc.ini || true
+ln -fs /etc/alternc/alternc.ini /etc/$php/cli/conf.d/alternc.ini || true
+if [ -x /usr/sbin/apache2 ]; then
+    # hook 
+    run-parts --arg=apache2 /usr/lib/alternc/install.d 
+    
+    s=""
+    # unused from AlternC 1.0, FIXME: remove it later
+    if [ -L /etc/apache2/mods-enabled/vhost_alias.load ]
+    then
+        a2dismod vhost_alias
+        s="apache2"
+    fi 
+    if ! [ -L /etc/apache2/mods-enabled/$php.load ]
+    then
+	    a2enmod $php
+    fi
+    if ! [ -L /etc/apache2/mods-enabled/rewrite.load ]
+    then
+	    a2enmod rewrite
+    fi
+    if [ -e /etc/alternc/apache.pem ]; then
+        # We enable proftpd tls module
+        cat /etc/proftpd/modules.conf | sed -e 's/^#LoadModule mod_tls.c/LoadModule mod_tls.c/' > /etc/proftpd/modules.conf.alternc-new
+        mv /etc/proftpd/modules.conf.alternc-new /etc/proftpd/modules.conf 
+        cp /etc/proftpd/modules.conf /etc/alternc/templates/proftpd/
+        # We enable apache2 SSL : 
+        if [ ! -L /etc/apache2/mods-enabled/ssl.load ] ; then
+            a2enmod ssl
+            s="apache2"
+        fi
+        if [ ! -h /etc/apache2/conf.d/alternc-ssl.conf ] && [ -e /etc/apache2/conf.d/ ]; then
+            ln -sf /etc/alternc/apache2-ssl.conf /etc/apache2/conf.d/alternc-ssl.conf
+            s="apache2"
+        fi
+
+	# We enable dovecot SSL certificate instructions: (on wheezy we should use a new file in /etc/dovecot/conf.d/ )
+	sed -i -e 's#^ssl_cert_file.*$#ssl_cert_file = /etc/ssl/certs/ssl-cert-snakeoil.pem#' -e 's#^ssl_key_file.*$#ssl_key_file = /etc/ssl/private/ssl-cert-snakeoil.key#' /etc/dovecot/dovecot.conf
+
+    else
+        # We disable proftpd tls module
+        cat /etc/proftpd/modules.conf | sed -e 's/^LoadModule mod_tls.c/#LoadModule mod_tls.c/' > /etc/proftpd/modules.conf.alternc-new
+        mv /etc/proftpd/modules.conf.alternc-new /etc/proftpd/modules.conf 
+        cp /etc/proftpd/modules.conf /etc/alternc/templates/proftpd/
+
+	# We disable dovecot SSL certificate instructions: (on wheezy we should remove a file in /etc/dovecot/conf.d/ )
+        sed -i -e 's#^ssl_cert_file.*$#ssl_cert_file = /etc/ssl/certs/ssl-cert-snakeoil.pem#' -e 's#^ssl_key_file.*$#ssl_key_file = /etc/ssl/private/ssl-cert-snakeoil.key#' /etc/dovecot/dovecot.conf
+
+        echo "SSL not configured"
+        echo "create a certificate in /etc/alternc/apache.pem and rerun alternc.install"
+    fi
+    if [ ! -h /etc/apache2/conf.d/alternc.conf ] && [ -e /etc/apache2/conf.d/ ]; then
+        ln -sf /etc/alternc/apache2.conf /etc/apache2/conf.d/alternc.conf
+        s="apache2"
+    fi
+    if [ -e /etc/apache2/sites-enabled/000-default ]; then
+        a2dissite default
+        s="apache2"
+    fi
+    SERVICES="$SERVICES $s"
+fi
+
+# Manage sudoers.d include appearing in Squeeze:
+# if the "includedir" is not here, we add it ONLY IF visudo -c is happy.
+if ! grep -q "#includedir */etc/sudoers.d" /etc/sudoers ; then
+    if ! cat /etc/sudoers.d/* | visudo -c -f -  >/dev/null ; then
+	echo -e "\033[31m**********************************************"
+	echo "*                                            *"
+	echo "*   ALTERNC  ACTION REQUESTED                *"
+	echo "*                                            *"
+	echo "* SUDO is NOT configured properly            *"
+	echo "* check your files in /etc/sudoers.d !       *" 
+	echo "* then launch alternc.install again          *"
+	echo "*                                            *"
+	echo "**********************************************"
+	echo -e "\033[0m"
+	exit 1
+    else 
+	echo "#includedir */etc/sudoers.d" >>/etc/sudoers
+    fi
+fi
+
+# Copy postfix *_checks if they do not exist
+for file in body_checks header_checks; do
+    if [ ! -e "/etc/postfix/$file" ]; then
+        cp /usr/share/alternc/install/$file /etc/postfix
+    fi
+done
+
+# Attribute the correct rights to critical postfix files
+if [ -e /etc/postfix/myalias.cf -o -e /etc/postfix/mydomain.cf -o -e /etc/postfix/mygid.cf -o -e /etc/postfix/myrelay-domain.sh -o -e /etc/postfix/myvirtual.cf -o -e /etc/postfix/myrelay.cf -o -e /etc/postfix/myquota.cf ]; then
+    chown root:postfix /etc/postfix/my*
+    chmod 640 /etc/postfix/my*
+fi
+
+if [ ! -f /etc/postfix/main.cf ]
+then
+    echo -e "\033[31m**********************************************"
+    echo "*                                            *"
+    echo "*   ALTERNC  ACTION REQUESTED                *"
+    echo "*                                            *"
+    echo "* POSTFIX is NOT configured properly         *"
+    echo "* launch dpkg-reconfigure -plow postfix      *" 
+    echo "* and choose 'Internet Site'                 *"
+    echo "* then launch alternc.install again          *"
+    echo "*                                            *"
+    echo "**********************************************"
+    echo -e "\033[0m"
+    exit 1
+fi
+
+# configure Postfix appropriatly for our needs
+if [ "$slave" = "1" ]; then
+    postfix_conf=/etc/alternc/postfix/postfix-slave.cf
+else
+    postfix_conf=/etc/alternc/postfix/postfix.cf
+fi
+grep -v '^\ *#' $postfix_conf |while read line ; do
+   if echo "$line" | grep -qi '^smtpd_tls_dcert_file' ;then
+     line_strip=`echo "$line"|tr -d '[:blank:]'`
+     pattern="*="
+     cert_file=${line_strip#$pattern}
+     echo $cert_file
+     echo $line
+     echo $line_strip
+     if [ -e $cert_file ];then
+        postconf -e "$line"
+     else
+        echo -e "\033[31m*****************************************************"
+        echo "* The certificate file : $cert_file does not exists *"
+	echo "* If you want to be able to use SSL/TLS             *"
+        echo "* please go to https://alternc.com/SSL              *"
+	echo "* to get information on how to create a certificate *"
+        echo "* Finally relaunch alternc.install                  *"
+        echo "*****************************************************"
+	echo -e "\033[0m"
+     fi
+  else
+        postconf -e "$line"
+  fi
+done
+
+# Conviguring delivery used by Postfix
+/usr/lib/alternc/alternc_add_policy_dovecot
+
+# Bug #1215: configure mydestination when $FQDN is not in
+OLDDESTINATION=`postconf mydestination | awk -F '=' '{print $2}'`
+echo "$OLDDESTINATION" | grep -q -v "$FQDN" && postconf -e "mydestination = $FQDN, $OLDDESTINATION"
+
+# Remove phpmyadmin apache2 configuration
+rm -f /etc/apache2/conf.d/phpmyadmin.conf || true
+
+# Configure PHPMyAdmin
+include_str='include("/etc/alternc/phpmyadmin.inc.php")'
+pma_config='/etc/phpmyadmin/config.inc.php'
+
+# Sur une configuration vierge, inclure la configuration alternc
+if ! grep -e "${include_str/\"/\\\"}" $pma_config > /dev/null 2>&1; then
+    echo "$include_str;" >> $pma_config
+fi
+
+# Le template de /etc/alternc/phpmyadmin.inc.php viens d'être réappliqué, on 
+# regénére la liste des serveurs MySQL disponible dedans.
+mysql_query "select id,host,name from db_servers;" | while read id host name ; do
+echo "
+// Server #$id in db_servers
+\$i++;
+\$cfg['Servers'][\$i]['connect_type']  = 'tcp';    // How to connect to MySQL server ('tcp' or 'socket')
+\$cfg['Servers'][\$i]['auth_type']     = 'cookie';    // Authentication method (config, http or cookie based)?
+\$cfg['Servers'][\$i]['hide_db']       = 'information_schema';
+\$cfg['Servers'][\$i]['verbose']       = '$name'; // human name
+\$cfg['Servers'][\$i]['host']          = '$host'; // MySQL hostname or IP address
+" >> '/etc/alternc/phpmyadmin.inc.php'
+done
+
+# Reload incron. Useless, but who know?
+SERVICES="$SERVICES incron"
+ 
+if [ -e /etc/proftpd.conf ] ; then
+    chmod 640 /etc/proftpd/proftpd.conf
+fi
+
+if [ -x /usr/sbin/locale-gen ] ; then
+    touch /etc/locale.gen
+    LOCALECHANGED=""
+    # Add de_DE ISO-8859-1, en_US ISO-8859-1, es_ES ISO-8859-1, fr_FR ISO-8859-1 to the locales : 
+    if ! grep -q "^de_DE ISO-8859-1$" /etc/locale.gen ; then
+	echo "de_DE ISO-8859-1" >>/etc/locale.gen
+	LOCALECHANGED=1
+    fi
+    if ! grep -q "^en_US ISO-8859-1$" /etc/locale.gen ; then
+	echo "en_US ISO-8859-1" >>/etc/locale.gen
+	LOCALECHANGED=1
+    fi
+    if ! grep -q "^es_ES ISO-8859-1$" /etc/locale.gen ; then
+	echo "es_ES ISO-8859-1" >>/etc/locale.gen
+	LOCALECHANGED=1
+    fi
+    if ! grep -q "^fr_FR ISO-8859-1$" /etc/locale.gen ; then 
+	echo "fr_FR ISO-8859-1" >>/etc/locale.gen
+	LOCALECHANGED=1
+    fi
+    if ! grep -q "^de_DE.UTF-8 UTF-8$" /etc/locale.gen ; then
+	echo "de_DE.UTF-8 UTF-8" >>/etc/locale.gen
+	LOCALECHANGED=1
+    fi
+    if ! grep -q "^fr_FR.UTF-8 UTF-8$" /etc/locale.gen ; then
+	echo "fr_FR.UTF-8 UTF-8" >>/etc/locale.gen
+	LOCALECHANGED=1
+    fi
+    if ! grep -q "^es_ES.UTF-8 UTF-8$" /etc/locale.gen ; then
+	echo "es_ES.UTF-8 UTF-8" >>/etc/locale.gen
+	LOCALECHANGED=1
+    fi
+    if ! grep -q "^en_US.UTF-8 UTF-8$" /etc/locale.gen ; then
+	echo "en_US.UTF-8 UTF-8" >>/etc/locale.gen
+	LOCALECHANGED=1
+    fi
+    if ! grep -q "^it_IT.UTF-8 UTF-8$" /etc/locale.gen ; then
+	echo "it_IT.UTF-8 UTF-8" >>/etc/locale.gen
+	LOCALECHANGED=1
+    fi
+    if ! grep -q "^nl_NL.UTF-8 UTF-8$" /etc/locale.gen ; then
+	echo "nl_NL.UTF-8 UTF-8" >>/etc/locale.gen
+	LOCALECHANGED=1
+    fi
+    if [ "$LOCALECHANGED" ] ; then
+	locale-gen
+    fi
+fi
+
+# remaining steps are only for the master
+if [ "$slave" = "1" ]; then
+    exit 0
+fi
+
+#######################################################################
+# populate alternc database with the mailname used by postfix to send mail for each vhost
+#
+# If mailname does not exist, create it. Fix #1495
+test -e "/etc/mailname" || hostname -f > "/etc/mailname" 
+# Allow for all the users to view /etc/mailname
+chmod +r "/etc/mailname"
+
+#######################################################################
+# Save installed files to check them during next install
+#
+tar -zcf "$INSTALLED_CONFIG_TAR" -C / $CONFIG_FILES
+
+#######################################################################
+# Last touches
+#
+
+find $ALTERNC_HTML -maxdepth 1 -type d -exec setfacl -b -k -m d:g:alterncpanel:-wx -m d:u:alterncpanel:-wx -m u:alterncpanel:-wx -m g:alterncpanel:-wx {} \;
+
+#creating log file
+if [ ! -e "/var/log/alternc/bureau.log" ]; then
+  test -d "/var/log/alternc/" || mkdir -p "/var/log/alternc/"
+  touch "/var/log/alternc/bureau.log"
+fi
+
+if [ ! -e "/var/log/alternc/update_domains.log" ]; then
+  test -d "/var/log/alternc/" || mkdir -p "/var/log/alternc/"
+  touch "/var/log/alternc/update_domains.log"
+fi
+
+# Be sure of the owner of the logs files
+chmod 640 /var/log/alternc/bureau.log /var/log/alternc/update_domains.log
+chown alterncpanel:adm /var/log/alternc/bureau.log /var/log/alternc/update_domains.log
+
+# Creating admin user if needed
+HAS_ROOT=`mysql --defaults-file=/etc/alternc/my.cnf -e "SELECT COUNT(*) FROM membres WHERE login = 'admin' OR login = 'root' and su = 1" | tail -1`
+
+if [ "$HAS_ROOT" != "1" ]; then
+    echo "Creating admin user..."
+    echo ""
+
+    if su - alterncpanel -s /bin/bash -c /usr/share/alternc/install/newone.php
+      then
+      echo "*******************************************"
+      echo "*                                         *"
+      echo "*               Admin account             *"
+      echo "*               ------------              *"
+      echo "*                                         *"
+      echo "* user: admin             password: admin *"
+      echo "*                                         *"
+      echo "* Please change this as soon as possible! *"
+      echo "*                                         *"
+      echo "*******************************************"
+    else
+	echo "Unable to create the first AlternC account (named 'admin'). newone.php returned $?. Check your MySQL database, PHP, and the /etc/alternc/local.sh file. Also check for any error above during install."
+    fi
+else
+    ##UPDATE default db_server following /etc/alternc/my.cnf values
+    if [ "$MYSQL_HOST" == "localhost" ]; then
+        MYSQL_HOST_CLIENT="localhost"
+    else
+        MYSQL_HOST_CLIENT="%"
+    fi
+    mysql --defaults-file=/etc/alternc/my.cnf -e "UPDATE db_servers SET host='$MYSQL_HOST', login='$MYSQL_USER', password='$MYSQL_PASS', client='$MYSQL_HOST_CLIENT' WHERE name='Default';"
+fi
+
+#giving vmail user read access on dovecot sql file
+chgrp vmail /etc/dovecot/dovecot.conf
+chmod g+r /etc/dovecot/dovecot.conf
+
+# We force the re-computing of the DNS zones, since we may have changed the IP address (see #460)
+/usr/bin/mysql --defaults-file="/etc/alternc/my.cnf" -B -e "update domaines set dns_action='UPDATE' WHERE gesdns=1;"
+
+# We ensure localhost is trusted to opendkim
+mkdir -p "/etc/opendkim/keys"
+touch /etc/opendkim/TrustedHosts /etc/opendkim/SigningTable /etc/opendkim/KeyTable
+grep -q "^127.0.0.1\$" /etc/opendkim/TrustedHosts || echo "127.0.0.1" >>/etc/opendkim/TrustedHosts
+grep -q "^localhost\$" /etc/opendkim/TrustedHosts || echo "localhost" >>/etc/opendkim/TrustedHosts
+grep -q "^$PUBLIC_IP\$" /etc/opendkim/TrustedHosts || echo "$PUBLIC_IP" >>/etc/opendkim/TrustedHosts
+
+# Add opendkim to service to restart
+SERVICES="$SERVICES opendkim"
+
+# hook 
+run-parts --arg=before-reload /usr/lib/alternc/install.d 
+
+#######################################################################
+# Reload services
+#
+for service in postfix bind9 apache2 dovecot cron proftpd ; do
+    invoke-rc.d $service force-reload || true
+done
+
+# We should restart apaches after all configuration stuff ...
+for service in $SERVICES; do
+    test -x /etc/init.d/$service && invoke-rc.d $service stop || true
+done
+for service in $SERVICES; do
+    test -x /etc/init.d/$service && invoke-rc.d $service start || true
+done
+
+echo "Fix all the permission. May be quite long..."
+echo "YOU CAN INTERUPT THIS BY USING Ctrl-c THEN y TO BYPASS THE ERROR." 
+/usr/lib/alternc/fixperms.sh
+echo "Compile PO files"
+
+# TODO : includes the .MO in debian package ;) 
+find /usr/share/alternc/panel/locales -maxdepth 1 -mindepth 1 -type d -name "*_*" | while read A
+do 
+    B="$A/LC_MESSAGES"
+    cd $B
+    rm -f alternc.mo alternc.po
+    msgcat --use-first *.po alternc >alternc.po
+    msgfmt alternc.po -o alternc.mo
+done
+
+# Fix some perms
+# Fix phpmyadmin import trac#1557
+test -d "/var/lib/phpmyadmin/tmp" && dpkg-statoverride --update --add www-data alterncpanel 0775 "/var/lib/phpmyadmin/tmp" 2>/dev/null || true
+test -f "/etc/phpmyadmin/config-db.php" && dpkg-statoverride --update --add www-data alterncpanel 0644 "/etc/phpmyadmin/config-db.php" 2>/dev/null || true
+
+# hook 
+run-parts --arg=end /usr/lib/alternc/install.d 
+
+# Unlock jobs !
+unlock_jobs
+
+# Rebuild all web configuration
+/usr/lib/alternc/rebuild_all_webconf.sh --force
diff --git a/roundcube/roundcube-install b/roundcube/roundcube-install
index 81011d12..59a26119 100644
--- a/roundcube/roundcube-install
+++ b/roundcube/roundcube-install
@@ -39,7 +39,7 @@ then
     . /etc/alternc/local.sh
     # Configuration template location
     TEMPLATE_DIR="/etc/alternc/templates"
-    CONFIG_FILES="etc/roundcube/main.inc.php etc/roundcube/plugins/password/config.inc.php etc/roundcube/plugins/managesieve/config.inc.php"
+    CONFIG_FILES="etc/roundcube/config.inc.php etc/roundcube/plugins/password/config.inc.php"
 
     cat > $SED_SCRIPT <<EOF
 s\\%%ALTERNC_LOC%%\\$ALTERNC_LOC\\;
@@ -81,9 +81,17 @@ EOF
     echo "    Done"
 
     echo "Deconfiguring javascript-common alias"
-    rm -f /etc/apache2/conf.d/javascript-common.conf
+    if [ -f /etc/apache2/conf.d/javascript-common.conf ]; then
+        	rm -f /etc/apache2/conf.d/javascript-common.conf
+    fi
+    if [ -f /etc/apache2/conf-available/javascript-common.conf ] ; then
+		a2disconf javascript-common.conf
+		service apache2 reload
+    fi
     # just in case 
-    sed -i -e "s/^Alias \/javascript/# Do not uncomment, commented by AlternC to prevent a global alias\n#Alias \/javascript/" /etc/javascript-common/javascript-common.conf
+    if [ -f /etc/javascript-common/javascript-common.conf ]; then
+        sed -i -e "s/^Alias \/javascript/# Do not uncomment, commented by AlternC to prevent a global alias\n#Alias \/javascript/" /etc/javascript-common/javascript-common.conf
+    fi
     echo "    Done"
     
 fi
diff --git a/roundcube/templates/roundcube/config.inc.php b/roundcube/templates/roundcube/config.inc.php
new file mode 100644
index 00000000..207eb01c
--- /dev/null
+++ b/roundcube/templates/roundcube/config.inc.php
@@ -0,0 +1,83 @@
+<?php
+
+/*
++-----------------------------------------------------------------------+
+| Local configuration for the Roundcube Webmail installation.           |
+|                                                                       |
+| This is a sample configuration file only containing the minimum       |
+| setup required for a functional installation. Copy more options       |
+| from defaults.inc.php to this file to override the defaults.          |
+|                                                                       |
+| This file is part of the Roundcube Webmail client                     |
+| Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+|                                                                       |
+| Licensed under the GNU General Public License version 3 or            |
+| any later version with exceptions for skins & plugins.                |
+| See the README file for a full license statement.                     |
++-----------------------------------------------------------------------+
+*/
+
+$config = array();
+
+/* Do not set db_dsnw here, use dpkg-reconfigure roundcube-core to configure database ! */
+include_once("/etc/roundcube/debian-db-roundcube.php");
+
+// The mail host chosen to perform the log-in.
+// Leave blank to show a textbox at login, give a list of hosts
+// to display a pulldown menu or set one host as string.
+// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls://
+// Supported replacement variables:
+// %n - hostname ($_SERVER['SERVER_NAME'])
+// %t - hostname without the first part
+// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
+// %s - domain name after the '@' from e-mail address provided at login screen
+// For example %n = mail.domain.tld, %t = domain.tld
+$config['default_host'] = 'localhost';
+
+// SMTP server host (for sending mails).
+// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls://
+// If left blank, the PHP mail() function is used
+// Supported replacement variables:
+// %h - user's IMAP hostname
+// %n - hostname ($_SERVER['SERVER_NAME'])
+// %t - hostname without the first part
+// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
+// %z - IMAP domain (IMAP hostname without the first part)
+// For example %n = mail.domain.tld, %t = domain.tld
+$config['smtp_server'] = '';
+
+// SMTP port (default is 25; use 587 for STARTTLS or 465 for the
+// deprecated SSL over SMTP (aka SMTPS))
+$config['smtp_port'] = 25;
+
+// SMTP username (if required) if you use %u as the username Roundcube
+// will use the current username for login
+$config['smtp_user'] = '';
+
+// SMTP password (if required) if you use %p as the password Roundcube
+// will use the current user's password for login
+$config['smtp_pass'] = '';
+
+// provide an URL where a user can get support for this Roundcube installation
+// PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE!
+$config['support_url'] = '';
+
+// Name your service. This is displayed on the login screen and in the window title
+$config['product_name'] = 'Roundcube Webmail';
+
+// this key is used to encrypt the users imap password which is stored
+// in the session record (and the client cookie if remember password is enabled).
+// please provide a string of exactly 24 chars.
+// YOUR KEY MUST BE DIFFERENT THAN THE SAMPLE VALUE FOR SECURITY REASONS
+$config['des_key'] = 'PFMKPD0[UcU3tvt8zrODOIsQ';
+
+// List of active plugins (in plugins/ directory)
+$config['plugins'] = array(
+'archive',
+'zipdownload',
+'managesieve',
+'password'
+);
+
+// skin name: folder from skins/
+$config['skin'] = 'larry';
diff --git a/roundcube/templates/roundcube/main.inc.php b/roundcube/templates/roundcube/main.inc.php
deleted file mode 100644
index 97c9f6bf..00000000
--- a/roundcube/templates/roundcube/main.inc.php
+++ /dev/null
@@ -1,803 +0,0 @@
-<?php
-
-/***********************************************************************/
-// Roundcube's Configuration file for AlternC                          //
-//                                                                     //
-// /!\ WARNING /!\ Do not edit this file, edit the one in              //
-// /etc/alternc/templates/roundcube/ and launch alternc.install again. //
-//                                                                     //
-/***********************************************************************/
-
-/*
-+-----------------------------------------------------------------------+
-| Main configuration file                                               |
-|                                                                       |
-| This file is part of the Roundcube Webmail client                     |
-| Copyright (C) 2005-2011, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-
-*/
-
-$rcmail_config = array();
-
-// ----------------------------------
-// LOGGING/DEBUGGING
-// ----------------------------------
-
-// system error reporting: 1 = log; 2 = report (not implemented yet), 4 = show, 8 = trace
-$rcmail_config['debug_level'] = 1;
-
-// log driver:  'syslog' or 'file'.
-$rcmail_config['log_driver'] = 'file';
-
-// date format for log entries
-// (read http://php.net/manual/en/function.date.php for all format characters)
-$rcmail_config['log_date_format'] = 'd-M-Y H:i:s O';
-
-// Syslog ident string to use, if using the 'syslog' log driver.
-$rcmail_config['syslog_id'] = 'roundcube';
-
-// Syslog facility to use, if using the 'syslog' log driver.
-// For possible values see installer or http://php.net/manual/en/function.openlog.php
-$rcmail_config['syslog_facility'] = LOG_USER;
-
-// Log sent messages to <log_dir>/sendmail or to syslog
-$rcmail_config['smtp_log'] = true;
-
-// Log successful logins to <log_dir>/userlogins or to syslog
-$rcmail_config['log_logins'] = false;
-
-// Log session authentication errors to <log_dir>/session or to syslog
-$rcmail_config['log_session'] = false;
-
-// Log SQL queries to <log_dir>/sql or to syslog
-$rcmail_config['sql_debug'] = false;
-
-// Log IMAP conversation to <log_dir>/imap or to syslog
-$rcmail_config['imap_debug'] = false;
-
-// Log LDAP conversation to <log_dir>/ldap or to syslog
-$rcmail_config['ldap_debug'] = false;
-
-// Log SMTP conversation to <log_dir>/smtp or to syslog
-$rcmail_config['smtp_debug'] = false;
-
-// ----------------------------------
-// IMAP
-// ----------------------------------
-
-// the mail host chosen to perform the log-in
-// leave blank to show a textbox at login, give a list of hosts
-// to display a pulldown menu or set one host as string.
-// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls://
-// Supported replacement variables:
-// %n - http hostname ($_SERVER['SERVER_NAME'])
-// %d - domain (http hostname without the first part)
-// %s - domain name after the '@' from e-mail address provided at login screen
-// For example %n = mail.domain.tld, %d = domain.tld
-$rcmail_config['default_host'] = 'localhost';
-
-// TCP port used for IMAP connections
-$rcmail_config['default_port'] = 143;
-
-// IMAP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use
-// best server supported one)
-$rcmail_config['imap_auth_type'] = null;
-
-// If you know your imap's folder delimiter, you can specify it here.
-// Otherwise it will be determined automatically
-$rcmail_config['imap_delimiter'] = null;
-
-// If IMAP server doesn't support NAMESPACE extension, but you're
-// using shared folders or personal root folder is non-empty, you'll need to
-// set these options. All can be strings or arrays of strings.
-// Folders need to be ended with directory separator, e.g. "INBOX."
-// (special directory "~" is an exception to this rule)
-// These can be used also to overwrite server's namespaces
-$rcmail_config['imap_ns_personal'] = null;
-$rcmail_config['imap_ns_other']    = null;
-$rcmail_config['imap_ns_shared']   = null;
-
-// By default IMAP capabilities are readed after connection to IMAP server
-// In some cases, e.g. when using IMAP proxy, there's a need to refresh the list
-// after login. Set to True if you've got this case.
-$rcmail_config['imap_force_caps'] = false;
-
-// By default list of subscribed folders is determined using LIST-EXTENDED
-// extension if available. Some servers (dovecot 1.x) returns wrong results
-// for shared namespaces in this case. http://trac.roundcube.net/ticket/1486225
-// Enable this option to force LSUB command usage instead.
-$rcmail_config['imap_force_lsub'] = true;
-
-// IMAP connection timeout, in seconds. Default: 0 (no limit)
-$rcmail_config['imap_timeout'] = 10;
-
-// Optional IMAP authentication identifier to be used as authorization proxy
-$rcmail_config['imap_auth_cid'] = null;
-
-// Optional IMAP authentication password to be used for imap_auth_cid
-$rcmail_config['imap_auth_pw'] = null;
-
-// Type of IMAP indexes cache. Supported values: 'db', 'apc' and 'memcache'.
-$rcmail_config['imap_cache'] = null;
-
-// Enables messages cache. Only 'db' cache is supported.
-$rcmail_config['messages_cache'] = false;
-
-
-// ----------------------------------
-// SMTP
-// ----------------------------------
-
-// SMTP server host (for sending mails).
-// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls://
-// If left blank, the PHP mail() function is used
-// Supported replacement variables:
-// %h - user's IMAP hostname
-// %n - http hostname ($_SERVER['SERVER_NAME'])
-// %d - domain (http hostname without the first part)
-// %z - IMAP domain (IMAP hostname without the first part)
-// For example %n = mail.domain.tld, %d = domain.tld
-$rcmail_config['smtp_server'] = 'localhost';
-
-// SMTP port (default is 25; 465 for SSL)
-$rcmail_config['smtp_port'] = 25;
-
-// SMTP username (if required) if you use %u as the username Roundcube
-// will use the current username for login
-$rcmail_config['smtp_user'] = '%u';
-
-// SMTP password (if required) if you use %p as the password Roundcube
-// will use the current user's password for login
-$rcmail_config['smtp_pass'] = '%p';
-
-// SMTP AUTH type (DIGEST-MD5, CRAM-MD5, LOGIN, PLAIN or empty to use
-// best server supported one)
-$rcmail_config['smtp_auth_type'] = '';
-
-// Optional SMTP authentication identifier to be used as authorization proxy
-$rcmail_config['smtp_auth_cid'] = null;
-
-// Optional SMTP authentication password to be used for smtp_auth_cid
-$rcmail_config['smtp_auth_pw'] = null;
-
-// SMTP HELO host
-// Hostname to give to the remote server for SMTP 'HELO' or 'EHLO' messages
-// Leave this blank and you will get the server variable 'server_name' or
-// localhost if that isn't defined.
-$rcmail_config['smtp_helo_host'] = '';
-
-// SMTP connection timeout, in seconds. Default: 0 (no limit)
-$rcmail_config['smtp_timeout'] = 0;
-
-// ----------------------------------
-// SYSTEM
-// ----------------------------------
-
-// THIS OPTION WILL ALLOW THE INSTALLER TO RUN AND CAN EXPOSE SENSITIVE CONFIG DATA.
-// ONLY ENABLE IT IF YOU'RE REALLY SURE WHAT YOU'RE DOING!
-$rcmail_config['enable_installer'] = false;
-
-// use this folder to store log files (must be writeable for apache user)
-// This is used by the 'file' log driver.
-$rcmail_config['log_dir'] = 'logs/';
-
-// use this folder to store temp files (must be writeable for apache user)
-$rcmail_config['temp_dir'] = 'temp/';
-
-// lifetime of message cache
-// possible units: s, m, h, d, w
-$rcmail_config['message_cache_lifetime'] = '10d';
-
-// enforce connections over https
-// with this option enabled, all non-secure connections will be redirected.
-// set the port for the ssl connection as value of this option if it differs from the default 443
-$rcmail_config['force_https'] = false;
-
-// tell PHP that it should work as under secure connection
-// even if it doesn't recognize it as secure ($_SERVER['HTTPS'] is not set)
-// e.g. when you're running Roundcube behind a https proxy
-$rcmail_config['use_https'] = false;
-
-// Allow browser-autocompletion on login form.
-// 0 - disabled, 1 - username and host only, 2 - username, host, password
-$rcmail_config['login_autocomplete'] = 2;
-
-// If users authentication is not case sensitive this must be enabled.
-// You can also use it to force conversion of logins to lower case.
-// After enabling it all user records need to be updated, e.g. with query:
-// UPDATE users SET username = LOWER(username);
-$rcmail_config['login_lc'] = false;
-
-// automatically create a new Roundcube user when log-in the first time.
-// a new user will be created once the IMAP login succeeds.
-// set to false if only registered users can use this service
-$rcmail_config['auto_create_user'] = true;
-
-// replace Roundcube logo with this image
-// specify an URL relative to the document root of this Roundcube installation
-$rcmail_config['skin_logo'] = 'skins/default/images/roundcube_alternc_logo.png';
-
-// Includes should be interpreted as PHP files
-$rcmail_config['skin_include_php'] = false;
-
-// Session lifetime in minutes
-// must be greater than 'keep_alive'/60
-$rcmail_config['session_lifetime'] = 60;
-
-// session domain: .example.org
-$rcmail_config['session_domain'] = '';
-
-// session name. Default: 'roundcube_sessid'
-$rcmail_config['session_name'] = null;
-
-// Backend to use for session storage. Can either be 'db' (default) or 'memcache'
-// If set to memcache, a list of servers need to be specified in 'memcache_hosts'
-// Make sure the Memcache extension (http://pecl.php.net/package/memcache) version >= 2.0.0 is installed
-$rcmail_config['session_storage'] = 'db';
-
-// Use these hosts for accessing memcached
-// Define any number of hosts in the form hostname:port
-$rcmail_config['memcache_hosts'] = null; // e.g. array( 'localhost:11211', '192.168.1.12:11211' );
-
-// check client IP in session athorization
-$rcmail_config['ip_check'] = false;
-
-// check referer of incoming requests
-$rcmail_config['referer_check'] = false;
-
-// X-Frame-Options HTTP header value sent to prevent from Clickjacking.
-// Possible values: sameorigin|deny. Set to false in order to disable sending them
-$rcmail_config['x_frame_options'] = 'sameorigin';
-
-// this key is used to encrypt the users imap password which is stored
-// in the session record (and the client cookie if remember password is enabled).
-// please provide a string of exactly 24 chars.
-$rcmail_config['des_key'] = '%%deskey%%';
-
-// Automatically add this domain to user names for login
-// Only for IMAP servers that require full e-mail addresses for login
-// Specify an array with 'host' => 'domain' values to support multiple hosts
-// Supported replacement variables:
-// %h - user's IMAP hostname
-// %n - http hostname ($_SERVER['SERVER_NAME'])
-// %d - domain (http hostname without the first part)
-// %z - IMAP domain (IMAP hostname without the first part)
-// For example %n = mail.domain.tld, %d = domain.tld
-$rcmail_config['username_domain'] = '';
-
-// This domain will be used to form e-mail addresses of new users
-// Specify an array with 'host' => 'domain' values to support multiple hosts
-// Supported replacement variables:
-// %h - user's IMAP hostname
-// %n - http hostname ($_SERVER['SERVER_NAME'])
-// %d - domain (http hostname without the first part)
-// %z - IMAP domain (IMAP hostname without the first part)
-// For example %n = mail.domain.tld, %d = domain.tld
-$rcmail_config['mail_domain'] = '';
-
-// Password charset.
-// Use it if your authentication backend doesn't support UTF-8.
-// Defaults to ISO-8859-1 for backward compatibility
-$rcmail_config['password_charset'] = 'ISO-8859-1';
-
-// How many seconds must pass between emails sent by a user
-$rcmail_config['sendmail_delay'] = 0;
-
-// Maximum number of recipients per message. Default: 0 (no limit)
-$rcmail_config['max_recipients'] = 0;
-
-// Maximum allowednumber of members of an address group. Default: 0 (no limit)
-// If 'max_recipients' is set this value should be less or equal
-$rcmail_config['max_group_members'] = 0;
-
-// add this user-agent to message headers when sending
-$rcmail_config['useragent'] = 'Roundcube Webmail/'.RCMAIL_VERSION;
-
-// use this name to compose page titles
-$rcmail_config['product_name'] = 'Roundcube Webmail';
-
-// try to load host-specific configuration
-// see http://trac.roundcube.net/wiki/Howto_Config for more details
-$rcmail_config['include_host_config'] = false;
-
-// path to a text file which will be added to each sent message
-// paths are relative to the Roundcube root folder
-$rcmail_config['generic_message_footer'] = '';
-
-// path to a text file which will be added to each sent HTML message
-// paths are relative to the Roundcube root folder
-$rcmail_config['generic_message_footer_html'] = '';
-
-// add a received header to outgoing mails containing the creators IP and hostname
-$rcmail_config['http_received_header'] = false;
-
-// Whether or not to encrypt the IP address and the host name
-// these could, in some circles, be considered as sensitive information;
-// however, for the administrator, these could be invaluable help
-// when tracking down issues.
-$rcmail_config['http_received_header_encrypt'] = false;
-
-// This string is used as a delimiter for message headers when sending
-// a message via mail() function. Leave empty for auto-detection
-$rcmail_config['mail_header_delimiter'] = NULL;
-
-// number of chars allowed for line when wrapping text.
-// text wrapping is done when composing/sending messages
-$rcmail_config['line_length'] = 72;
-
-// send plaintext messages as format=flowed
-$rcmail_config['send_format_flowed'] = true;
-
-// don't allow these settings to be overriden by the user
-$rcmail_config['dont_override'] = array();
-
-// Set identities access level:
-// 0 - many identities with possibility to edit all params
-// 1 - many identities with possibility to edit all params but not email address
-// 2 - one identity with possibility to edit all params
-// 3 - one identity with possibility to edit all params but not email address
-$rcmail_config['identities_level'] = 0;
-
-// Mimetypes supported by the browser.
-// attachments of these types will open in a preview window
-// either a comma-separated list or an array: 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,application/pdf'
-$rcmail_config['client_mimetypes'] = null;  # null == default
-
-// mime magic database
-$rcmail_config['mime_magic'] = '/usr/share/misc/magic';
-
-// path to imagemagick identify binary
-$rcmail_config['im_identify_path'] = '/usr/bin/identify';
-
-// path to imagemagick convert binary
-$rcmail_config['im_convert_path'] = '/usr/bin/convert';
-
-// maximum size of uploaded contact photos in pixel
-$rcmail_config['contact_photo_size'] = 160;
-
-// Enable DNS checking for e-mail address validation
-$rcmail_config['email_dns_check'] = true;
-
-// ----------------------------------
-// PLUGINS
-// ----------------------------------
-
-// List of active plugins (in plugins/ directory)
-$rcmail_config['plugins'] = array("managesieve","password");
-
-// ----------------------------------
-// USER INTERFACE
-// ----------------------------------
-
-// default messages sort column. Use empty value for default server's sorting,
-// or 'arrival', 'date', 'subject', 'from', 'to', 'size', 'cc'
-$rcmail_config['message_sort_col'] = '';
-
-// default messages sort order
-$rcmail_config['message_sort_order'] = 'DESC';
-
-// These cols are shown in the message list. Available cols are:
-// subject, from, to, cc, replyto, date, size, status, flag, attachment, 'priority'
-$rcmail_config['list_cols'] = array('subject', 'status', 'from', 'date', 'size', 'flag', 'attachment');
-
-// the default locale setting (leave empty for auto-detection)
-// RFC1766 formatted language name like en_US, de_DE, de_CH, fr_FR, pt_BR
-$rcmail_config['language'] = null;
-
-// use this format for date display (date or strftime format)
-$rcmail_config['date_format'] = 'Y-m-d';
-
-// give this choice of date formats to the user to select from
-$rcmail_config['date_formats'] = array('Y-m-d', 'd-m-Y', 'Y/m/d', 'm/d/Y', 'd/m/Y', 'd.m.Y', 'j.n.Y');
-
-// use this format for time display (date or strftime format)
-$rcmail_config['time_format'] = 'H:i';
-
-// give this choice of time formats to the user to select from
-$rcmail_config['time_formats'] = array('G:i', 'H:i', 'g:i a', 'h:i A');
-
-// use this format for short date display (derived from date_format and time_format)
-$rcmail_config['date_short'] = 'D H:i';
-
-// use this format for detailed date/time formatting (derived from date_format and time_format)
-$rcmail_config['date_long'] = 'Y-m-d H:i';
-
-// store draft message is this mailbox
-// leave blank if draft messages should not be stored
-// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP)
-$rcmail_config['drafts_mbox'] = 'Drafts';
-
-// store spam messages in this mailbox
-// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP)
-$rcmail_config['junk_mbox'] = 'Junk';
-
-// store sent message is this mailbox
-// leave blank if sent messages should not be stored
-// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP)
-$rcmail_config['sent_mbox'] = 'Sent';
-
-// move messages to this folder when deleting them
-// leave blank if they should be deleted directly
-// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP)
-$rcmail_config['trash_mbox'] = 'Trash';
-
-// display these folders separately in the mailbox list.
-// these folders will also be displayed with localized names
-// NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP)
-$rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Junk', 'Trash');
-
-// automatically create the above listed default folders on first login
-$rcmail_config['create_default_folders'] = true;
-
-// protect the default folders from renames, deletes, and subscription changes
-$rcmail_config['protect_default_folders'] = true;
-
-// if in your system 0 quota means no limit set this option to true
-$rcmail_config['quota_zero_as_unlimited'] = true;
-
-// Make use of the built-in spell checker. It is based on GoogieSpell.
-// Since Google only accepts connections over https your PHP installatation
-// requires to be compiled with Open SSL support
-$rcmail_config['enable_spellcheck'] = true;
-
-// Enables spellchecker exceptions dictionary.
-// Setting it to 'shared' will make the dictionary shared by all users.
-$rcmail_config['spellcheck_dictionary'] = false;
-
-// Set the spell checking engine. 'googie' is the default. 'pspell' is also available,
-// but requires the Pspell extensions. When using Nox Spell Server, also set 'googie' here.
-$rcmail_config['spellcheck_engine'] = 'pspell';
-
-// For a locally installed Nox Spell Server, please specify the URI to call it.
-// Get Nox Spell Server from http://orangoo.com/labs/?page_id=72
-// Leave empty to use the Google spell checking service, what means
-// that the message content will be sent to Google in order to check spelling
-$rcmail_config['spellcheck_uri'] = '';
-
-// These languages can be selected for spell checking.
-// Configure as a PHP style hash array: array('en'=>'English', 'de'=>'Deutsch');
-// Leave empty for default set of available language.
-$rcmail_config['spellcheck_languages'] = NULL;
-
-// Makes that words with all letters capitalized will be ignored (e.g. GOOGLE)
-$rcmail_config['spellcheck_ignore_caps'] = false;
-
-// Makes that words with numbers will be ignored (e.g. g00gle)
-$rcmail_config['spellcheck_ignore_nums'] = false;
-
-// Makes that words with symbols will be ignored (e.g. g@@gle)
-$rcmail_config['spellcheck_ignore_syms'] = false;
-
-// Use this char/string to separate recipients when composing a new message
-$rcmail_config['recipients_separator'] = ',';
-
-// don't let users set pagesize to more than this value if set
-$rcmail_config['max_pagesize'] = 200;
-
-// Minimal value of user's 'keep_alive' setting (in seconds)
-// Must be less than 'session_lifetime'
-$rcmail_config['min_keep_alive'] = 60;
-
-// Enables files upload indicator. Requires APC installed and enabled apc.rfc1867 option.
-// By default refresh time is set to 1 second. You can set this value to true
-// or any integer value indicating number of seconds.
-$rcmail_config['upload_progress'] = false;
-
-// Specifies for how many seconds the Undo button will be available
-// after object delete action. Currently used with supporting address book sources.
-// Setting it to 0, disables the feature.
-$rcmail_config['undo_timeout'] = 0;
-
-// ----------------------------------
-// ADDRESSBOOK SETTINGS
-// ----------------------------------
-
-// This indicates which type of address book to use. Possible choises:
-// 'sql' (default) and 'ldap'.
-// If set to 'ldap' then it will look at using the first writable LDAP
-// address book as the primary address book and it will not display the
-// SQL address book in the 'Address Book' view.
-$rcmail_config['address_book_type'] = 'sql';
-
-// In order to enable public ldap search, configure an array like the Verisign
-// example further below. if you would like to test, simply uncomment the example.
-// Array key must contain only safe characters, ie. a-zA-Z0-9_
-$rcmail_config['ldap_public'] = array();
-
-// If you are going to use LDAP for individual address books, you will need to
-// set 'user_specific' to true and use the variables to generate the appropriate DNs to access it.
-//
-// The recommended directory structure for LDAP is to store all the address book entries
-// under the users main entry, e.g.:
-//
-//  o=root
-//   ou=people
-//    uid=user@domain
-//  mail=contact@contactdomain
-//
-// So the base_dn would be uid=%fu,ou=people,o=root
-// The bind_dn would be the same as based_dn or some super user login.
-/*
-* example config for Verisign directory
-*
-$rcmail_config['ldap_public']['Verisign'] = array(
-'name'          => 'Verisign.com',
-// Replacement variables supported in host names:
-// %h - user's IMAP hostname
-// %n - http hostname ($_SERVER['SERVER_NAME'])
-// %d - domain (http hostname without the first part)
-// %z - IMAP domain (IMAP hostname without the first part)
-// For example %n = mail.domain.tld, %d = domain.tld
-'hosts'         => array('directory.verisign.com'),
-'port'          => 389,
-'use_tls'	      => false,
-'ldap_version'  => 3,       // using LDAPv3
-'user_specific' => false,   // If true the base_dn, bind_dn and bind_pass default to the user's IMAP login.
-// %fu - The full username provided, assumes the username is an email
-//       address, uses the username_domain value if not an email address.
-// %u  - The username prior to the '@'.
-// %d  - The domain name after the '@'.
-// %dc - The domain name hierarchal string e.g. "dc=test,dc=domain,dc=com"
-// %dn - DN found by ldap search when search_filter/search_base_dn are used
-'base_dn'       => '',
-'bind_dn'       => '',
-'bind_pass'     => '',
-// It's possible to bind for an individual address book
-// The login name is used to search for the DN to bind with
-'search_base_dn' => '',
-'search_filter'  => '',   // e.g. '(&(objectClass=posixAccount)(uid=%u))'
-// DN and password to bind as before searching for bind DN, if anonymous search is not allowed
-'search_bind_dn' => '',
-'search_bind_pw' => '',
-// Default for %dn variable if search doesn't return DN value
-'search_dn_default' => '',
-// Optional authentication identifier to be used as SASL authorization proxy
-// bind_dn need to be empty
-'auth_cid'       => '',
-// SASL authentication method (for proxy auth), e.g. DIGEST-MD5
-'auth_method'    => '',
-// Indicates if the addressbook shall be hidden from the list.
-// With this option enabled you can still search/view contacts.
-'hidden'        => false,
-// Indicates if the addressbook shall not list contacts but only allows searching.
-'searchonly'    => false,
-// Indicates if we can write to the LDAP directory or not.
-// If writable is true then these fields need to be populated:
-// LDAP_Object_Classes, required_fields, LDAP_rdn
-'writable'       => false,
-// To create a new contact these are the object classes to specify
-// (or any other classes you wish to use).
-'LDAP_Object_Classes' => array('top', 'inetOrgPerson'),
-// The RDN field that is used for new entries, this field needs
-// to be one of the search_fields, the base of base_dn is appended
-// to the RDN to insert into the LDAP directory.
-'LDAP_rdn'       => 'mail',
-// The required fields needed to build a new contact as required by
-// the object classes (can include additional fields not required by the object classes).
-'required_fields' => array('cn', 'sn', 'mail'),
-'search_fields'   => array('mail', 'cn'),  // fields to search in
-// mapping of contact fields to directory attributes
-'fieldmap' => array(
-// Roundcube  => LDAP
-'name'        => 'cn',
-'surname'     => 'sn',
-'firstname'   => 'givenName',
-'email'       => 'mail',
-'phone:home'  => 'homePhone',
-'phone:work'  => 'telephoneNumber',
-'phone:mobile' => 'mobile',
-'street'      => 'street',
-'zipcode'     => 'postalCode',
-'locality'    => 'l',
-'country'     => 'c',
-'organization' => 'o',
-),
-'sort'          => 'cn',    // The field to sort the listing by.
-'scope'         => 'sub',   // search mode: sub|base|list
-'filter'        => '(objectClass=inetOrgPerson)',      // used for basic listing (if not empty) and will be &'d with search queries. example: status=act
-'fuzzy_search'  => true,    // server allows wildcard search
-'vlv'           => false,   // Enable Virtual List View to more efficiently fetch paginated data (if server supports it)
-'numsub_filter' => '(objectClass=organizationalUnit)',   // with VLV, we also use numSubOrdinates to query the total number of records. Set this filter to get all numSubOrdinates attributes for counting
-'sizelimit'     => '0',     // Enables you to limit the count of entries fetched. Setting this to 0 means no limit.
-'timelimit'     => '0',     // Sets the number of seconds how long is spend on the search. Setting this to 0 means no limit.
-'referrals'     => true|false,  // Sets the LDAP_OPT_REFERRALS option. Mostly used in multi-domain Active Directory setups
-
-// definition for contact groups (uncomment if no groups are supported)
-// for the groups base_dn, the user replacements %fu, %u, $d and %dc work as for base_dn (see above)
-// if the groups base_dn is empty, the contact base_dn is used for the groups as well
-// -> in this case, assure that groups and contacts are separated due to the concernig filters!
-'groups'        => array(
-'base_dn'     => '',
-'filter'      => '(objectClass=groupOfNames)',
-'object_classes' => array("top", "groupOfNames"),
-'member_attr'  => 'member',   // name of the member attribute, e.g. uniqueMember
-'name_attr'    => 'cn',       // attribute to be used as group name
-),
-);
-*/
-
-// An ordered array of the ids of the addressbooks that should be searched
-// when populating address autocomplete fields server-side. ex: array('sql','Verisign');
-$rcmail_config['autocomplete_addressbooks'] = array('sql');
-
-// The minimum number of characters required to be typed in an autocomplete field
-// before address books will be searched. Most useful for LDAP directories that
-// may need to do lengthy results building given overly-broad searches
-$rcmail_config['autocomplete_min_length'] = 1;
-
-// Number of parallel autocomplete requests.
-// If there's more than one address book, n parallel (async) requests will be created,
-// where each request will search in one address book. By default (0), all address
-// books are searched in one request.
-$rcmail_config['autocomplete_threads'] = 0;
-
-// Max. numer of entries in autocomplete popup. Default: 15.
-$rcmail_config['autocomplete_max'] = 15;
-
-// show address fields in this order
-// available placeholders: {street}, {locality}, {zipcode}, {country}, {region}
-$rcmail_config['address_template'] = '{street}<br/>{locality} {zipcode}<br/>{country} {region}';
-
-// Matching mode for addressbook search (including autocompletion)
-// 0 - partial (*abc*), default
-// 1 - strict (abc)
-// 2 - prefix (abc*)
-// Note: For LDAP sources fuzzy_search must be enabled to use 'partial' or 'prefix' mode
-$rcmail_config['addressbook_search_mode'] = 0;
-
-// ----------------------------------
-// USER PREFERENCES
-// ----------------------------------
-
-// Use this charset as fallback for message decoding
-$rcmail_config['default_charset'] = 'UTF-8';
-
-// skin name: folder from skins/
-$rcmail_config['skin'] = 'default';
-
-// show up to X items in list view
-$rcmail_config['pagesize'] = 40;
-
-// use this timezone to display date/time
-$rcmail_config['timezone'] = 'auto';
-
-// is daylight saving On? Default: (bool)date('I');
-$rcmail_config['dst_active'] = null;
-
-// prefer displaying HTML messages
-$rcmail_config['prefer_html'] = true;
-
-// display remote inline images
-// 0 - Never, always ask
-// 1 - Ask if sender is not in address book
-// 2 - Always show inline images
-$rcmail_config['show_images'] = 0;
-
-// compose html formatted messages by default
-// 0 - never, 1 - always, 2 - on reply to HTML message only
-$rcmail_config['htmleditor'] = 0;
-
-// show pretty dates as standard
-$rcmail_config['prettydate'] = true;
-
-// save compose message every 300 seconds (5min)
-$rcmail_config['draft_autosave'] = 300;
-
-// default setting if preview pane is enabled
-$rcmail_config['preview_pane'] = true;
-
-// Mark as read when viewed in preview pane (delay in seconds)
-// Set to -1 if messages in preview pane should not be marked as read
-$rcmail_config['preview_pane_mark_read'] = -1;
-
-// Clear Trash on logout
-$rcmail_config['logout_purge'] = true;
-
-// Compact INBOX on logout
-$rcmail_config['logout_expunge'] = false;
-
-// Display attached images below the message body
-$rcmail_config['inline_images'] = true;
-
-// Encoding of long/non-ascii attachment names:
-// 0 - Full RFC 2231 compatible
-// 1 - RFC 2047 for 'name' and RFC 2231 for 'filename' parameter (Thunderbird's default)
-// 2 - Full 2047 compatible
-$rcmail_config['mime_param_folding'] = 1;
-
-// Set true if deleted messages should not be displayed
-// This will make the application run slower
-$rcmail_config['skip_deleted'] = false;
-
-// Set true to Mark deleted messages as read as well as deleted
-// False means that a message's read status is not affected by marking it as deleted
-$rcmail_config['read_when_deleted'] = true;
-
-// Set to true to never delete messages immediately
-// Use 'Purge' to remove messages marked as deleted
-$rcmail_config['flag_for_deletion'] = false;
-
-// Default interval for keep-alive/check-recent requests (in seconds)
-// Must be greater than or equal to 'min_keep_alive' and less than 'session_lifetime'
-$rcmail_config['keep_alive'] = 60;
-
-// If true all folders will be checked for recent messages
-$rcmail_config['check_all_folders'] = true;
-
-// If true, after message delete/move, the next message will be displayed
-$rcmail_config['display_next'] = true;
-
-// 0 - Do not expand threads
-// 1 - Expand all threads automatically
-// 2 - Expand only threads with unread messages
-$rcmail_config['autoexpand_threads'] = 0;
-
-// When replying place cursor above original message (top posting)
-$rcmail_config['top_posting'] = false;
-
-// When replying strip original signature from message
-$rcmail_config['strip_existing_sig'] = true;
-
-// Show signature:
-// 0 - Never
-// 1 - Always
-// 2 - New messages only
-// 3 - Forwards and Replies only
-$rcmail_config['show_sig'] = 1;
-
-// When replying or forwarding place sender's signature above existing message
-$rcmail_config['sig_above'] = false;
-
-// Use MIME encoding (quoted-printable) for 8bit characters in message body
-$rcmail_config['force_7bit'] = false;
-
-// Defaults of the search field configuration.
-// The array can contain a per-folder list of header fields which should be considered when searching
-// The entry with key '*' stands for all folders which do not have a specific list set.
-// Please note that folder names should to be in sync with $rcmail_config['default_imap_folders']
-$rcmail_config['search_mods'] = null;  // Example: array('*' => array('subject'=>1, 'from'=>1), 'Sent' => array('subject'=>1, 'to'=>1));
-
-// Defaults of the addressbook search field configuration.
-$rcmail_config['addressbook_search_mods'] = null;  // Example: array('name'=>1, 'firstname'=>1, 'surname'=>1, 'email'=>1, '*'=>1);
-
-// 'Delete always'
-// This setting reflects if mail should be always deleted
-// when moving to Trash fails. This is necessary in some setups
-// when user is over quota and Trash is included in the quota.
-$rcmail_config['delete_always'] = false;
-
-// Behavior if a received message requests a message delivery notification (read receipt)
-// 0 = ask the user, 1 = send automatically, 2 = ignore (never send or ask)
-// 3 = send automatically if sender is in addressbook, otherwise ask the user
-// 4 = send automatically if sender is in addressbook, otherwise ignore
-$rcmail_config['mdn_requests'] = 2;
-
-// Return receipt checkbox default state
-$rcmail_config['mdn_default'] = 0;
-
-// Delivery Status Notification checkbox default state
-$rcmail_config['dsn_default'] = 0;
-
-// Place replies in the folder of the message being replied to
-$rcmail_config['reply_same_folder'] = false;
-
-// Sets default mode of Forward feature to "forward as attachment"
-$rcmail_config['forward_attachment'] = false;
-
-// Defines address book (internal index) to which new contacts will be added
-// By default it is the first writeable addressbook.
-// Note: Use '0' for built-in address book.
-$rcmail_config['default_addressbook'] = null;
-
-// Enables spell checking before sending a message.
-$rcmail_config['spellcheck_before_send'] = false;
-
-// Skip alternative email addresses in autocompletion (show one address per contact)
-$rcmail_config['autocomplete_single'] = false;
-
-// end of config file
-
-?>
diff --git a/roundcube/templates/roundcube/plugins/password/config.inc.php b/roundcube/templates/roundcube/plugins/password/config.inc.php
index f2741c57..6d49ef6e 100644
--- a/roundcube/templates/roundcube/plugins/password/config.inc.php
+++ b/roundcube/templates/roundcube/plugins/password/config.inc.php
@@ -1,47 +1,56 @@
 <?php
 
-/***********************************************************************/
-// Configuration file of password's plugin of Roundcube for AlternC    //
-//                                                                     //
-// /!\ WARNING /!\ Do not edit this file, edit the one in              //
-// /etc/alternc/templates/roundcube/plugins/password/                  //
-// and launch alternc.install again.                                   //
-//                                                                     //
-/***********************************************************************/
-
 // Password Plugin options
 // -----------------------
 // A driver to use for password change. Default: "sql".
 // See README file for list of supported driver names.
-$rcmail_config['password_driver'] = 'sql';
+$config['password_driver'] = 'sql';
 
 // Determine whether current password is required to change password.
 // Default: false.
-$rcmail_config['password_confirm_current'] = true;
+$config['password_confirm_current'] = true;
 
 // Require the new password to be a certain length.
 // set to blank to allow passwords of any length
-$rcmail_config['password_minimum_length'] = 8;
+$config['password_minimum_length'] = 8;
 
 // Require the new password to contain a letter and punctuation character
 // Change to false to remove this check.
-$rcmail_config['password_require_nonalpha'] = true;
+$config['password_require_nonalpha'] = true;
 
 // Enables logging of password changes into logs/password
-$rcmail_config['password_log'] = true;
+$config['password_log'] = true;
+
+// Comma-separated list of login exceptions for which password change
+// will be not available (no Password tab in Settings)
+$config['password_login_exceptions'] = null;
+
+// Array of hosts that support password changing. Default is NULL.
+// Listed hosts will feature a Password option in Settings; others will not.
+// Example:
+//$config['password_hosts'] = array('mail.example.com', 'mail2.example.org');
+$config['password_hosts'] = null;
+
+// Enables saving the new password even if it matches the old password. Useful
+// for upgrading the stored passwords after the encryption scheme has changed.
+$config['password_force_save'] = false;
+
+// Enables forcing new users to change their password at their first login.
+$config['password_force_new_user'] = false;
 
 
 // SQL Driver options
 // ------------------
 // PEAR database DSN for performing the query. By default
 // Roundcube DB settings are used.
-$rcmail_config['password_db_dsn'] = 'mysql://%%roundcube-login%%:%%roundcube-password%%@%%dbhost%%/%%dbname%%';
+$config['password_db_dsn'] = 'mysql://%%roundcube-login%%:%%roundcube-password%%@%%dbhost%%/%%dbname%%';
 
 // The SQL query used to change the password.
 // The query can contain the following macros that will be expanded as follows:
 //      %p is replaced with the plaintext new password
 //      %c is replaced with the crypt version of the new password, MD5 if available
-//         otherwise DES.
+//         otherwise DES. More hash function can be enabled using the password_crypt_hash 
+//         configuration parameter.
 //      %D is replaced with the dovecotpw-crypted version of the new password
 //      %o is replaced with the password before the change
 //      %n is replaced with the hashed version of the new password
@@ -54,45 +63,57 @@ $rcmail_config['password_db_dsn'] = 'mysql://%%roundcube-login%%:%%roundcube-pas
 //         (in case the username is an email address)
 // Escaping of macros is handled by this module.
 // Default: "SELECT update_passwd(%c, %u)"
-$rcmail_config['password_query'] = 'UPDATE address a LEFT JOIN domaines d ON d.id=a.domain_id SET a.password=%c WHERE d.domaine=%d AND address=%l';
+$config['password_query'] = 'UPDATE address a LEFT JOIN domaines d ON d.id=a.domain_id SET a.password=%c WHERE d.domaine=%d AND address=%l';
+
+// By default the crypt() function which is used to create the '%c' 
+// parameter uses the md5 algorithm. To use different algorithms 
+// you can choose between: des, md5, blowfish, sha256, sha512.
+// Before using other hash functions than des or md5 please make sure
+// your operating system supports the other hash functions.
+$config['password_crypt_hash'] = 'md5';
 
 // By default domains in variables are using unicode.
 // Enable this option to use punycoded names
-$rcmail_config['password_idn_ascii'] = false;
+$config['password_idn_ascii'] = false;
 
 // Path for dovecotpw (if not in $PATH)
-// $rcmail_config['password_dovecotpw'] = '/usr/local/sbin/dovecotpw';
+// $config['password_dovecotpw'] = '/usr/local/sbin/dovecotpw';
 
 // Dovecot method (dovecotpw -s 'method')
-$rcmail_config['password_dovecotpw_method'] = 'CRAM-MD5';
+$config['password_dovecotpw_method'] = 'CRAM-MD5';
 
 // Enables use of password with crypt method prefix in %D, e.g. {MD5}$1$LUiMYWqx$fEkg/ggr/L6Mb2X7be4i1/
-$rcmail_config['password_dovecotpw_with_method'] = false;
+$config['password_dovecotpw_with_method'] = false;
 
 // Using a password hash for %n and %q variables.
 // Determine which hashing algorithm should be used to generate
 // the hashed new and current password for using them within the
 // SQL query. Requires PHP's 'hash' extension.
-$rcmail_config['password_hash_algorithm'] = 'sha1';
+$config['password_hash_algorithm'] = 'sha1';
 
 // You can also decide whether the hash should be provided
 // as hex string or in base64 encoded format.
-$rcmail_config['password_hash_base64'] = false;
+$config['password_hash_base64'] = false;
+
+// Iteration count parameter for Blowfish-based hashing algo.
+// It must be between 4 and 31. Default: 12.
+// Be aware, the higher the value, the longer it takes to generate the password hashes.
+$config['password_blowfish_cost'] = 12;
 
 
 // Poppassd Driver options
 // -----------------------
 // The host which changes the password
-$rcmail_config['password_pop_host'] = 'localhost';
+$config['password_pop_host'] = 'localhost';
 
 // TCP port used for poppassd connections
-$rcmail_config['password_pop_port'] = 106;
+$config['password_pop_port'] = 106;
 
 
 // SASL Driver options
 // -------------------
 // Additional arguments for the saslpasswd2 call
-$rcmail_config['password_saslpasswd_args'] = '';
+$config['password_saslpasswd_args'] = '';
 
 
 // LDAP and LDAP_SIMPLE Driver options
@@ -101,41 +122,41 @@ $rcmail_config['password_saslpasswd_args'] = '';
 // You can provide one or several hosts in an array in which case the hosts are tried from left to right.
 // Exemple: array('ldap1.exemple.com', 'ldap2.exemple.com');
 // Default: 'localhost'
-$rcmail_config['password_ldap_host'] = 'localhost';
+$config['password_ldap_host'] = 'localhost';
 
 // LDAP server port to connect to
 // Default: '389'
-$rcmail_config['password_ldap_port'] = '389';
+$config['password_ldap_port'] = '389';
 
 // TLS is started after connecting
 // Using TLS for password modification is recommanded.
 // Default: false
-$rcmail_config['password_ldap_starttls'] = false;
+$config['password_ldap_starttls'] = false;
 
 // LDAP version
 // Default: '3'
-$rcmail_config['password_ldap_version'] = '3';
+$config['password_ldap_version'] = '3';
 
 // LDAP base name (root directory)
 // Exemple: 'dc=exemple,dc=com'
-$rcmail_config['password_ldap_basedn'] = 'dc=exemple,dc=com';
+$config['password_ldap_basedn'] = 'dc=exemple,dc=com';
 
 // LDAP connection method
 // There is two connection method for changing a user's LDAP password.
 // 'user': use user credential (recommanded, require password_confirm_current=true)
 // 'admin': use admin credential (this mode require password_ldap_adminDN and password_ldap_adminPW)
 // Default: 'user'
-$rcmail_config['password_ldap_method'] = 'user';
+$config['password_ldap_method'] = 'user';
 
 // LDAP Admin DN
 // Used only in admin connection mode
 // Default: null
-$rcmail_config['password_ldap_adminDN'] = null;
+$config['password_ldap_adminDN'] = null;
 
 // LDAP Admin Password
 // Used only in admin connection mode
 // Default: null
-$rcmail_config['password_ldap_adminPW'] = null;
+$config['password_ldap_adminPW'] = null;
 
 // LDAP user DN mask
 // The user's DN is mandatory and as we only have his login,
@@ -145,7 +166,7 @@ $rcmail_config['password_ldap_adminPW'] = null;
 // '%domain' will be replaced by the current roundcube user's domain part
 // '%dc' will be replaced by domain name hierarchal string e.g. "dc=test,dc=domain,dc=com"
 // Exemple: 'uid=%login,ou=people,dc=exemple,dc=com'
-$rcmail_config['password_ldap_userDN_mask'] = 'uid=%login,ou=people,dc=exemple,dc=com';
+$config['password_ldap_userDN_mask'] = 'uid=%login,ou=people,dc=exemple,dc=com';
 
 // LDAP search DN
 // The DN roundcube should bind with to find out user's DN
@@ -156,7 +177,7 @@ $rcmail_config['password_ldap_userDN_mask'] = 'uid=%login,ou=people,dc=exemple,d
 // users login to find his DN instead. A common reason might be that
 // your users are placed under different ou's like engineering or
 // sales which cannot be derived from their login only.
-$rcmail_config['password_ldap_searchDN'] = 'cn=roundcube,ou=services,dc=example,dc=com';
+$config['password_ldap_searchDN'] = 'cn=roundcube,ou=services,dc=example,dc=com';
 
 // LDAP search password
 // If password_ldap_searchDN is set, the password to use for
@@ -166,13 +187,13 @@ $rcmail_config['password_ldap_searchDN'] = 'cn=roundcube,ou=services,dc=example,
 // is only accesible to roundcube and don't forget to restrict roundcube's access to
 // your directory as much as possible using ACLs. Should this password be compromised
 // you want to minimize the damage.
-$rcmail_config['password_ldap_searchPW'] = 'secret';
+$config['password_ldap_searchPW'] = 'secret';
 
 // LDAP search base
 // If password_ldap_searchDN is set, the base to search in using the filter below.
 // Note that you should comment out the default password_ldap_userDN_mask setting
 // for this to take effect.
-$rcmail_config['password_ldap_search_base'] = 'ou=people,dc=example,dc=com';
+$config['password_ldap_search_base'] = 'ou=people,dc=example,dc=com';
 
 // LDAP search filter
 // If password_ldap_searchDN is set, the filter to use when
@@ -184,42 +205,43 @@ $rcmail_config['password_ldap_search_base'] = 'ou=people,dc=example,dc=com';
 // '%dc' will be replaced by domain name hierarchal string e.g. "dc=test,dc=domain,dc=com"
 // Example: '(uid=%login)'
 // Example: '(&(objectClass=posixAccount)(uid=%login))'
-$rcmail_config['password_ldap_search_filter'] = '(uid=%login)';
+$config['password_ldap_search_filter'] = '(uid=%login)';
 
 // LDAP password hash type
 // Standard LDAP encryption type which must be one of: crypt,
-// ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, or clear.
+// ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, ad, cram-md5 (dovecot style) or clear.
 // Please note that most encodage types require external libraries
 // to be included in your PHP installation, see function hashPassword in drivers/ldap.php for more info.
-// Default: 'crypt'
-$rcmail_config['password_ldap_encodage'] = 'crypt';
+// Multiple password Values can be generated by concatenating encodings with a +. E.g. 'cram-md5+crypt'
+// Default: 'crypt'.
+$config['password_ldap_encodage'] = 'crypt';
 
 // LDAP password attribute
 // Name of the ldap's attribute used for storing user password
 // Default: 'userPassword'
-$rcmail_config['password_ldap_pwattr'] = 'userPassword';
+$config['password_ldap_pwattr'] = 'userPassword';
 
 // LDAP password force replace
 // Force LDAP replace in cases where ACL allows only replace not read
 // See http://pear.php.net/package/Net_LDAP2/docs/latest/Net_LDAP2/Net_LDAP2_Entry.html#methodreplace
 // Default: true
-$rcmail_config['password_ldap_force_replace'] = true;
+$config['password_ldap_force_replace'] = true;
 
 // LDAP Password Last Change Date
 // Some places use an attribute to store the date of the last password change
 // The date is meassured in "days since epoch" (an integer value)
 // Whenever the password is changed, the attribute will be updated if set (e.g. shadowLastChange)
-$rcmail_config['password_ldap_lchattr'] = '';
+$config['password_ldap_lchattr'] = '';
 
 // LDAP Samba password attribute, e.g. sambaNTPassword
 // Name of the LDAP's Samba attribute used for storing user password
-$rcmail_config['password_ldap_samba_pwattr'] = '';
+$config['password_ldap_samba_pwattr'] = '';
  
 // LDAP Samba Password Last Change Date attribute, e.g. sambaPwdLastSet
 // Some places use an attribute to store the date of the last password change
 // The date is meassured in "seconds since epoch" (an integer value)
 // Whenever the password is changed, the attribute will be updated if set
-$rcmail_config['password_ldap_samba_lchattr'] = '';
+$config['password_ldap_samba_lchattr'] = '';
 
 
 // DirectAdmin Driver options
@@ -229,63 +251,60 @@ $rcmail_config['password_ldap_samba_lchattr'] = '';
 // The host can contain the following macros that will be expanded as follows:
 //     %h is replaced with the imap host (from the session info)
 //     %d is replaced with the domain part of the username (if the username is an email)
-$rcmail_config['password_directadmin_host'] = 'tcp://localhost';
+$config['password_directadmin_host'] = 'tcp://localhost';
 
 // TCP port used for DirectAdmin connections
-$rcmail_config['password_directadmin_port'] = 2222;
+$config['password_directadmin_port'] = 2222;
 
 
 // vpopmaild Driver options
 // -----------------------
 // The host which changes the password
-$rcmail_config['password_vpopmaild_host'] = 'localhost';
+$config['password_vpopmaild_host'] = 'localhost';
 
 // TCP port used for vpopmaild connections
-$rcmail_config['password_vpopmaild_port'] = 89;
+$config['password_vpopmaild_port'] = 89;
+
+// Timout used for the connection to vpopmaild (in seconds)
+$config['password_vpopmaild_timeout'] = 10;
 
 
 // cPanel Driver options
 // --------------------------
 // The cPanel Host name
-$rcmail_config['password_cpanel_host'] = 'host.domain.com';
+$config['password_cpanel_host'] = 'host.domain.com';
 
 // The cPanel admin username
-$rcmail_config['password_cpanel_username'] = 'username';
+$config['password_cpanel_username'] = 'username';
 
 // The cPanel admin password
-$rcmail_config['password_cpanel_password'] = 'password';
+$config['password_cpanel_password'] = 'password';
 
 // The cPanel port to use
-$rcmail_config['password_cpanel_port'] = 2082;
-
-// Using ssl for cPanel connections?
-$rcmail_config['password_cpanel_ssl'] = true;
-
-// The cPanel theme in use
-$rcmail_config['password_cpanel_theme'] = 'x';
+$config['password_cpanel_port'] = 2087;
 
 
 // XIMSS (Communigate server) Driver options
 // -----------------------------------------
 // Host name of the Communigate server
-$rcmail_config['password_ximss_host'] = 'mail.example.com';
+$config['password_ximss_host'] = 'mail.example.com';
 
 // XIMSS port on Communigate server
-$rcmail_config['password_ximss_port'] = 11024;
+$config['password_ximss_port'] = 11024;
 
 
 // chpasswd Driver options
 // ---------------------
 // Command to use
-$rcmail_config['password_chpasswd_cmd'] = 'sudo /usr/sbin/chpasswd 2> /dev/null';
+$config['password_chpasswd_cmd'] = 'sudo /usr/sbin/chpasswd 2> /dev/null';
 
 
 // XMail Driver options
 // ---------------------
-$rcmail_config['xmail_host'] = 'localhost';
-$rcmail_config['xmail_user'] = 'YourXmailControlUser';
-$rcmail_config['xmail_pass'] = 'YourXmailControlPass';
-$rcmail_config['xmail_port'] = 6017;
+$config['xmail_host'] = 'localhost';
+$config['xmail_user'] = 'YourXmailControlUser';
+$config['xmail_pass'] = 'YourXmailControlPass';
+$config['xmail_port'] = 6017;
 
 
 // hMail Driver options
@@ -293,9 +312,9 @@ $rcmail_config['xmail_port'] = 6017;
 // Remote hMailServer configuration
 // true:  HMailserver is on a remote box (php.ini: com.allow_dcom = true)
 // false: Hmailserver is on same box as PHP
-$rcmail_config['hmailserver_remote_dcom'] = false;
+$config['hmailserver_remote_dcom'] = false;
 // Windows credentials
-$rcmail_config['hmailserver_server'] = array(
+$config['hmailserver_server'] = array(
     'Server' => 'localhost', // hostname or ip address
     'Username' => 'administrator', // windows username
     'Password' => 'password' // windows user password
@@ -313,6 +332,70 @@ $rcmail_config['hmailserver_server'] = array(
 // 5: domain-username
 // 6: username_domain
 // 7: domain_username
-$rcmail_config['password_virtualmin_format'] = 0;
+$config['password_virtualmin_format'] = 0;
 
-?>
+
+// pw_usermod Driver options
+// --------------------------
+// Use comma delimited exlist to disable password change for users
+// Add the following line to visudo to tighten security:
+// www  ALL=NOPASSWORD: /usr/sbin/pw
+$config['password_pw_usermod_cmd'] = 'sudo /usr/sbin/pw usermod -h 0 -n';
+
+
+// DBMail Driver options
+// -------------------
+// Additional arguments for the dbmail-users call
+$config['password_dbmail_args'] = '-p sha512';
+
+
+// Expect Driver options
+// ---------------------
+// Location of expect binary
+$config['password_expect_bin'] = '/usr/bin/expect';
+
+// Location of expect script (see helpers/passwd-expect)
+$config['password_expect_script'] = '';
+
+// Arguments for the expect script. See the helpers/passwd-expect file for details.
+// This is probably a good starting default:
+//   -telent -host localhost -output /tmp/passwd.log -log /tmp/passwd.log
+$config['password_expect_params'] = '';
+
+
+// smb Driver options
+// ---------------------
+// Samba host (default: localhost)
+// Supported replacement variables:
+// %n - hostname ($_SERVER['SERVER_NAME'])
+// %t - hostname without the first part
+// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
+$config['password_smb_host'] = 'localhost';
+// Location of smbpasswd binary
+$config['password_smb_cmd'] = '/usr/bin/smbpasswd';
+
+// gearman driver options
+// ---------------------
+// Gearman host (default: localhost)
+$config['password_gearman_host'] = 'localhost';
+
+
+
+// Plesk/PPA Driver options
+// --------------------
+// You need to allow RCP for IP of roundcube-server in Plesk/PPA Panel 
+
+// Plesk RCP Host
+$config['password_plesk_host'] = '10.0.0.5';
+
+// Plesk RPC Username
+$config['password_plesk_user'] = 'admin';
+
+// Plesk RPC Password
+$config['password_plesk_pass'] = 'password';
+
+// Plesk RPC Port
+$config['password_plesk_rpc_port'] = '8443';
+
+// Plesk RPC Path
+$config['password_plesk_rpc_path'] = 'enterprise/control/agent.php';
diff --git a/ssl/alternc-ssl.install.php b/ssl/alternc-ssl.install.php
index 041eef80..ba568910 100644
--- a/ssl/alternc-ssl.install.php
+++ b/ssl/alternc-ssl.install.php
@@ -9,9 +9,7 @@ if ($argv[1] == "templates") {
     // install ssl.conf
     echo "[alternc-ssl] Installing ssl.conf template\n";
     copy("/etc/alternc/templates/apache2/mods-available/ssl.conf","/etc/apache2/mods-available/ssl.conf");
-    if (!is_dir('/var/run/alternc-ssl')) {
-        mkdir("/var/run/alternc-ssl");
-    }
+    mkdir("/var/run/alternc-ssl");
     chown("/var/run/alternc-ssl","alterncpanel");
     chgrp("/var/run/alternc-ssl","alterncpanel");
     // replace open_basedir line if necessary : 
@@ -66,23 +64,4 @@ if ($argv[1] == "before-reload") {
         $db->query("UPDATE sub_domaines SET web_action='DELETE' WHERE type='php52-mixssl';");
     }
 
-    // Enable name-based virtual hosts in Apache2 : 
-    $f = fopen("/etc/apache2/ports.conf", "rb");
-    if (!$f) {
-        echo "FATAL: there is no /etc/apache2/ports.conf ! I can't configure name-based virtual hosts\n";
-    } else {
-        $found = false;
-        while ($s = fgets($f, 1024)) {
-            if (preg_match(":^[^#]*NameVirtualHost.*443:", $s)) {
-                $found = true;
-                break;
-            }
-        }
-        fclose($f);
-        if (!$found) {
-            $f = fopen("/etc/apache2/ports.conf", "ab");
-            fputs($f, "\n<IfModule mod_ssl.c>\n  NameVirtualHost *:443\n\n</IfModule>\n");
-            fclose($f);
-        }
-    }
 } // before-reload
diff --git a/ssl/ssl.conf b/ssl/ssl.conf
index c3a599d5..68b422b3 100644
--- a/ssl/ssl.conf
+++ b/ssl/ssl.conf
@@ -51,7 +51,7 @@ SSLSessionCacheTimeout  300
 #   Semaphore:
 #   Configure the path to the mutual exclusion semaphore the
 #   SSL engine uses internally for inter-process synchronization. 
-SSLMutex  file:${APACHE_RUN_DIR}/ssl_mutex
+Mutex  file:${APACHE_RUN_DIR}
 
 #   SSL Cipher Suite:
 #   List the ciphers that the client is permitted to negotiate. See the

From a7382b45a3de4096c2672a903c98d856acafe3a8 Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@sonntag.fr>
Date: Thu, 21 Jun 2018 17:34:47 +0200
Subject: [PATCH 15/30] adding changelog for 3.5.0rc1

---
 debian/changelog | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3ed86856..191ee5c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+alternc (3.5.0rc1) stable; urgency=low
+
+  * AlternC 3.5 for Jessie & Stretch
+  * added AlternC-ssl natively now, based on cert providers (external package)
+
+ -- Benjamin Sonntag <benjamin@sonntag.fr>  Fri, 21 Jun 2018 15:26:00 +0100
+
+alternc (3.1.11) oldoldstable; urgency=low
+
+  * fix This is a big security upgrade of AlternC 3.x
+  * added CSRF token to all forms (as much as possible) to prevent cross-site attacks
+  * added XSS protection to many form fields and views
+  * migrated the DB abstraction layer from mysql_* functions to PDO
+  * migrated the DB calls from addslases to prepared-queries or quotes
+  * fix many unix rights issues (prevents a root escalation from alterncpanel!)
+  * fix some little interface issues on forms
+
+ -- Benjamin Sonntag <benjamin@sonntag.fr>  Fri, 27 May 2016 10:36:00 +0200
+
 alternc (3.3.10) stable; urgency=low
 
   * Version identical to 3.1 for Squeeze

From 5ba055cf7f378a45db1f6fc21bae3ee656ecf510 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Tue, 12 Jun 2018 19:35:14 -0400
Subject: [PATCH 16/30] Cherrypick apache2 configuration for jessie/stretch

Sourced from https://github.com/fser/AlternC/commit/ea3371ae3489c254523ca7af9c87a03dc27431c4
---
 etc/alternc/templates/alternc/apache2.conf            | 6 +++---
 etc/alternc/templates/apache2/mods-available/ssl.conf | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/etc/alternc/templates/alternc/apache2.conf b/etc/alternc/templates/alternc/apache2.conf
index f82ff629..7fb527e6 100644
--- a/etc/alternc/templates/alternc/apache2.conf
+++ b/etc/alternc/templates/alternc/apache2.conf
@@ -11,7 +11,7 @@ AssignUserId www-data www-data
 
 # Deny access to the root filesystem
 <Directory />
-  Options +FollowSymLinks
+  Options FollowSymLinks
   AllowOverride None
   Order allow,deny
   Deny from all
@@ -62,13 +62,13 @@ ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
 
 <Directory /usr/share/phpmyadmin>
   AllowOverride AuthConfig Options FileInfo Limit Indexes
-  Options +Indexes +Includes +FollowSymLinks +MultiViews
+  Options Indexes Includes FollowSymLinks MultiViews
   Order allow,deny
   Allow from all
 </Directory>
 <Directory /usr/share/squirrelmail>
   AllowOverride AuthConfig Options FileInfo Limit Indexes
-  Options +Indexes +Includes +FollowSymLinks +MultiViews
+  Options Indexes Includes FollowSymLinks MultiViews
   Order allow,deny
   Allow from all
 </Directory>
diff --git a/etc/alternc/templates/apache2/mods-available/ssl.conf b/etc/alternc/templates/apache2/mods-available/ssl.conf
index 68b422b3..2ff7532c 100644
--- a/etc/alternc/templates/apache2/mods-available/ssl.conf
+++ b/etc/alternc/templates/apache2/mods-available/ssl.conf
@@ -51,7 +51,7 @@ SSLSessionCacheTimeout  300
 #   Semaphore:
 #   Configure the path to the mutual exclusion semaphore the
 #   SSL engine uses internally for inter-process synchronization. 
-Mutex  file:${APACHE_RUN_DIR}
+#SSLMutex  file:${APACHE_RUN_DIR}/ssl_mutex
 
 #   SSL Cipher Suite:
 #   List the ciphers that the client is permitted to negotiate. See the

From 0be79f9b54e6cb30f6d3bd6c333f65156fd82171 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sun, 15 Apr 2018 21:45:18 -0400
Subject: [PATCH 17/30] Use phpunit from composer download

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 45f05323..ae63fb76 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ php:
   - 5.5
   - 5.4
   - 5.3
-script: phpunit --coverage-clover=coverage.clover
+script: ../vendor/bin/phpunit --coverage-clover=coverage.clover
 before_script:
 # pear.phpunit.de offline, and travis have phpunit 
 #  - pear channel-discover pear.phpunit.de

From 76764e735fcf5bfdddded2daeab1a31e49bf4ba0 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sun, 15 Apr 2018 21:39:21 -0400
Subject: [PATCH 18/30] fixing travix.yml

---
 .travis.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ae63fb76..dc29ace8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,9 +7,7 @@ php:
   - 5.3
 script: ../vendor/bin/phpunit --coverage-clover=coverage.clover
 before_script:
-# pear.phpunit.de offline, and travis have phpunit 
-#  - pear channel-discover pear.phpunit.de
-#  - pear install phpunit/DbUnit
+  - composer require phpunit/dbunit
   - mysql -e 'create database alternc_test DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci;'
   - cd phpunit
 after_script:

From 3556fbb2d403c748e143fe68e8cb14fd756a9d29 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sun, 15 Apr 2018 21:23:24 -0400
Subject: [PATCH 19/30] cherry picking, update of phpunit for jessie

---
 phpunit/bootstrap.php                           |  3 ++-
 phpunit/lib/AlterncTest.php                     | 17 ++++++++++-------
 phpunit/tests/bureau/class/m_adminTest.php      |  5 ++++-
 phpunit/tests/bureau/class/m_authipTest.php     |  5 ++++-
 phpunit/tests/bureau/class/m_broTest.php        |  4 +++-
 phpunit/tests/bureau/class/m_cronTest.php       |  4 +++-
 phpunit/tests/bureau/class/m_cryptoTest.php     |  4 +++-
 .../tests/bureau/class/m_debug_alterncTest.php  |  4 +++-
 phpunit/tests/bureau/class/m_domTest.php        |  4 +++-
 phpunit/tests/bureau/class/m_errTest.php        |  4 +++-
 phpunit/tests/bureau/class/m_exportTest.php     |  4 +++-
 phpunit/tests/bureau/class/m_ftpTest.php        |  4 +++-
 phpunit/tests/bureau/class/m_hooksTest.php      |  4 +++-
 phpunit/tests/bureau/class/m_htaTest.php        |  4 +++-
 phpunit/tests/bureau/class/m_logTest.php        |  4 +++-
 phpunit/tests/bureau/class/m_lxcTest.php        |  4 +++-
 phpunit/tests/bureau/class/m_memTest.php        |  4 +++-
 phpunit/tests/bureau/class/m_menuTest.php       |  4 +++-
 phpunit/tests/bureau/class/m_piwikTest.php      |  4 +++-
 phpunit/tests/bureau/class/m_quotaTest.php      |  4 +++-
 20 files changed, 68 insertions(+), 26 deletions(-)

diff --git a/phpunit/bootstrap.php b/phpunit/bootstrap.php
index 294974d8..a02a5339 100644
--- a/phpunit/bootstrap.php
+++ b/phpunit/bootstrap.php
@@ -20,7 +20,7 @@ define('ALTERNC_PANEL',realpath(__DIR__."/../bureau"));; // Custom
 define('PHPUNIT_DATASETS_PATH',realpath(__DIR__."/tests/_datasets"));
 require_once ALTERNC_PANEL."/class/db_mysql.php";
 require_once ALTERNC_PANEL."/class/functions.php";
-
+require_once ALTERNC_PANEL."/class/variables.php";
 
 // General variables setup
 // *********************
@@ -144,6 +144,7 @@ echo "*** In progress: mysql.sql imported\n";
 $db                                     = new \DB_system($database, $user, $password);
 $cuid                                   = 0;
 $variables                              = new \m_variables();
+$msg                                    = new \m_messages();
 $mem                                    = new \m_mem();
 $err                                    = new \m_err();
 $authip                                 = new \m_authip();
diff --git a/phpunit/lib/AlterncTest.php b/phpunit/lib/AlterncTest.php
index cdd4248d..d31eb8d3 100644
--- a/phpunit/lib/AlterncTest.php
+++ b/phpunit/lib/AlterncTest.php
@@ -3,9 +3,14 @@
  * This is the abstract class for all tests
  * @see http://phpunit.de/manual/
  */
-abstract class AlterncTest extends PHPUnit_Extensions_Database_TestCase
+use PHPUnit\Framework\TestCase;
+use PHPUnit\DbUnit\TestCaseTrait;
+
+abstract class AlterncTest extends TestCase
 {
-        /**
+    use TestCaseTrait;
+
+    /**
      * @return PHPUnit_Extensions_Database_DB_IDatabaseConnection
      */
     public function getConnection()
@@ -14,9 +19,9 @@ abstract class AlterncTest extends PHPUnit_Extensions_Database_TestCase
         $pdo = new PDO('mysql:dbname='.$database.';host=127.0.0.1',$user,$password);
         return $this->createDefaultDBConnection($pdo);
     }
-    
+
     /**
-     * 
+     *
      * @param string $fileList
      * @return \PHPUnit_Extensions_Database_DataSet_YamlDataSet
      * @throws \Exception
@@ -40,8 +45,6 @@ abstract class AlterncTest extends PHPUnit_Extensions_Database_TestCase
         }
         $compositeDataSet            = new PHPUnit_Extensions_Database_DataSet_CompositeDataSet($datasetList);
         return $dataSet;
-    } 
-
-    
+    }
 
 }
diff --git a/phpunit/tests/bureau/class/m_adminTest.php b/phpunit/tests/bureau/class/m_adminTest.php
index a7d86deb..dab4f9f5 100644
--- a/phpunit/tests/bureau/class/m_adminTest.php
+++ b/phpunit/tests/bureau/class/m_adminTest.php
@@ -2,7 +2,10 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:58.
  */
-class m_adminTest extends PHPUnit_Framework_TestCase
+
+use PHPUnit\Framework\TestCase;
+
+class m_adminTest extends TestCase
 {
     /**
      * @var m_admin
diff --git a/phpunit/tests/bureau/class/m_authipTest.php b/phpunit/tests/bureau/class/m_authipTest.php
index fef3d3ae..ac41dd6a 100644
--- a/phpunit/tests/bureau/class/m_authipTest.php
+++ b/phpunit/tests/bureau/class/m_authipTest.php
@@ -2,7 +2,10 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:58.
  */
-class m_authipTest extends PHPUnit_Framework_TestCase
+
+use PHPUnit\Framework\TestCase;
+
+class m_authipTest extends TestCase
 {
     /**
      * @var m_authip
diff --git a/phpunit/tests/bureau/class/m_broTest.php b/phpunit/tests/bureau/class/m_broTest.php
index 5073b94b..04dd8014 100644
--- a/phpunit/tests/bureau/class/m_broTest.php
+++ b/phpunit/tests/bureau/class/m_broTest.php
@@ -2,7 +2,9 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:58.
  */
-class m_broTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_broTest extends TestCase
 {
     /**
      * @var m_bro
diff --git a/phpunit/tests/bureau/class/m_cronTest.php b/phpunit/tests/bureau/class/m_cronTest.php
index 5e4afd53..6189c39a 100644
--- a/phpunit/tests/bureau/class/m_cronTest.php
+++ b/phpunit/tests/bureau/class/m_cronTest.php
@@ -2,7 +2,9 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:58.
  */
-class m_cronTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_cronTest extends TestCase
 {
     /**
      * @var m_cron
diff --git a/phpunit/tests/bureau/class/m_cryptoTest.php b/phpunit/tests/bureau/class/m_cryptoTest.php
index 9e3711f1..0d0248cf 100644
--- a/phpunit/tests/bureau/class/m_cryptoTest.php
+++ b/phpunit/tests/bureau/class/m_cryptoTest.php
@@ -2,7 +2,9 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:58.
  */
-class m_cryptoTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_cryptoTest extends TestCase
 {
     /**
      * @var m_crypto
diff --git a/phpunit/tests/bureau/class/m_debug_alterncTest.php b/phpunit/tests/bureau/class/m_debug_alterncTest.php
index 118c1221..3da87a03 100644
--- a/phpunit/tests/bureau/class/m_debug_alterncTest.php
+++ b/phpunit/tests/bureau/class/m_debug_alterncTest.php
@@ -2,7 +2,9 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:58.
  */
-class m_debug_alterncTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_debug_alterncTest extends TestCase
 {
     /**
      * @var m_debug_alternc
diff --git a/phpunit/tests/bureau/class/m_domTest.php b/phpunit/tests/bureau/class/m_domTest.php
index b07f2c4d..12892330 100644
--- a/phpunit/tests/bureau/class/m_domTest.php
+++ b/phpunit/tests/bureau/class/m_domTest.php
@@ -2,7 +2,9 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:58.
  */
-class m_domTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_domTest extends TestCase
 {
     /**
      * @var m_dom
diff --git a/phpunit/tests/bureau/class/m_errTest.php b/phpunit/tests/bureau/class/m_errTest.php
index ea946064..414b96fb 100644
--- a/phpunit/tests/bureau/class/m_errTest.php
+++ b/phpunit/tests/bureau/class/m_errTest.php
@@ -2,7 +2,9 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:58.
  */
-class m_errTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_errTest extends TestCase
 {
     /**
      * @var m_err
diff --git a/phpunit/tests/bureau/class/m_exportTest.php b/phpunit/tests/bureau/class/m_exportTest.php
index 6e5d8985..88f7f752 100644
--- a/phpunit/tests/bureau/class/m_exportTest.php
+++ b/phpunit/tests/bureau/class/m_exportTest.php
@@ -2,7 +2,9 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:58.
  */
-class m_exportTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_exportTest extends TestCase
 {
     /**
      * @var m_export
diff --git a/phpunit/tests/bureau/class/m_ftpTest.php b/phpunit/tests/bureau/class/m_ftpTest.php
index 75afc778..5ecbf4a0 100644
--- a/phpunit/tests/bureau/class/m_ftpTest.php
+++ b/phpunit/tests/bureau/class/m_ftpTest.php
@@ -2,7 +2,9 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:58.
  */
-class m_ftpTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_ftpTest extends TestCase
 {
     /**
      * @var m_ftp
diff --git a/phpunit/tests/bureau/class/m_hooksTest.php b/phpunit/tests/bureau/class/m_hooksTest.php
index 88cb7944..096b6e08 100644
--- a/phpunit/tests/bureau/class/m_hooksTest.php
+++ b/phpunit/tests/bureau/class/m_hooksTest.php
@@ -2,7 +2,9 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:58.
  */
-class m_hooksTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_hooksTest extends TestCase
 {
     /**
      * @var m_hooks
diff --git a/phpunit/tests/bureau/class/m_htaTest.php b/phpunit/tests/bureau/class/m_htaTest.php
index 25ecbda6..39089f46 100644
--- a/phpunit/tests/bureau/class/m_htaTest.php
+++ b/phpunit/tests/bureau/class/m_htaTest.php
@@ -2,7 +2,9 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:58.
  */
-class m_htaTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_htaTest extends TestCase
 {
     /**
      * @var m_hta
diff --git a/phpunit/tests/bureau/class/m_logTest.php b/phpunit/tests/bureau/class/m_logTest.php
index 57adaa9c..7dc8cd98 100644
--- a/phpunit/tests/bureau/class/m_logTest.php
+++ b/phpunit/tests/bureau/class/m_logTest.php
@@ -2,7 +2,9 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:58.
  */
-class m_logTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_logTest extends TestCase
 {
     /**
      * @var m_log
diff --git a/phpunit/tests/bureau/class/m_lxcTest.php b/phpunit/tests/bureau/class/m_lxcTest.php
index 6b37244f..77200f07 100644
--- a/phpunit/tests/bureau/class/m_lxcTest.php
+++ b/phpunit/tests/bureau/class/m_lxcTest.php
@@ -2,7 +2,9 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:58.
  */
-class m_lxcTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_lxcTest extends TestCase
 {
     /**
      * @var m_lxc
diff --git a/phpunit/tests/bureau/class/m_memTest.php b/phpunit/tests/bureau/class/m_memTest.php
index d01dd4d2..00d87f8d 100644
--- a/phpunit/tests/bureau/class/m_memTest.php
+++ b/phpunit/tests/bureau/class/m_memTest.php
@@ -2,7 +2,9 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:59.
  */
-class m_memTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_memTest extends TestCase
 {
     /**
      * @var m_mem
diff --git a/phpunit/tests/bureau/class/m_menuTest.php b/phpunit/tests/bureau/class/m_menuTest.php
index 665bc6dc..ba39cd7e 100644
--- a/phpunit/tests/bureau/class/m_menuTest.php
+++ b/phpunit/tests/bureau/class/m_menuTest.php
@@ -2,7 +2,9 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:59.
  */
-class m_menuTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_menuTest extends TestCase
 {
     /**
      * @var m_menu
diff --git a/phpunit/tests/bureau/class/m_piwikTest.php b/phpunit/tests/bureau/class/m_piwikTest.php
index ac2f6a8f..b6e9a9be 100644
--- a/phpunit/tests/bureau/class/m_piwikTest.php
+++ b/phpunit/tests/bureau/class/m_piwikTest.php
@@ -2,7 +2,9 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:59.
  */
-class m_piwikTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_piwikTest extends TestCase
 {
     /**
      * @var m_piwik
diff --git a/phpunit/tests/bureau/class/m_quotaTest.php b/phpunit/tests/bureau/class/m_quotaTest.php
index 31ec009b..8d61b169 100644
--- a/phpunit/tests/bureau/class/m_quotaTest.php
+++ b/phpunit/tests/bureau/class/m_quotaTest.php
@@ -2,7 +2,9 @@
 /**
  * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:59.
  */
-class m_quotaTest extends PHPUnit_Framework_TestCase
+use PHPUnit\Framework\TestCase;
+
+class m_quotaTest extends TestCase
 {
     /**
      * @var m_quota

From 2a0b0c1f99d55a09059f3a27017119669589e256 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sun, 15 Apr 2018 20:12:50 -0400
Subject: [PATCH 20/30] Add php5.6 and php7.0 versions for tests

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index dc29ace8..40af921b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,8 @@ language: php
 services:
   - mysql
 php:
+  - 7.0
+  - 5.6
   - 5.5
   - 5.4
   - 5.3

From e8f764de2dde411ddcbde359898ad2ea81f101a8 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Sun, 15 Apr 2018 20:10:27 -0400
Subject: [PATCH 21/30] cherry picking, update of phpunit for jessie

---
 phpunit/bootstrap.php                         |   1 -
 .../tests/bureau/class/m_variablesTest.php    | 225 ------------------
 2 files changed, 226 deletions(-)
 delete mode 100644 phpunit/tests/bureau/class/m_variablesTest.php

diff --git a/phpunit/bootstrap.php b/phpunit/bootstrap.php
index a02a5339..35576259 100644
--- a/phpunit/bootstrap.php
+++ b/phpunit/bootstrap.php
@@ -143,7 +143,6 @@ echo "*** In progress: mysql.sql imported\n";
 
 $db                                     = new \DB_system($database, $user, $password);
 $cuid                                   = 0;
-$variables                              = new \m_variables();
 $msg                                    = new \m_messages();
 $mem                                    = new \m_mem();
 $err                                    = new \m_err();
diff --git a/phpunit/tests/bureau/class/m_variablesTest.php b/phpunit/tests/bureau/class/m_variablesTest.php
deleted file mode 100644
index 4cf6a814..00000000
--- a/phpunit/tests/bureau/class/m_variablesTest.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-/**
- * Generated by PHPUnit_SkeletonGenerator 1.2.1 on 2014-03-13 at 15:55:59.
- */
-class m_variablesTest extends AlterncTest
-{
-    /**
-     * @var m_variables
-     */
-    protected $object;
-    
-    /**
-     * @return PHPUnit_Extensions_Database_DataSet_IDataSet
-     */
-    public function getDataSet()
-    {
-        $list = array(
-            "testVariable_getNewWayArray"   => "variables-empty.yml",
-            "testVariable_getNewWayString"  => "variables-empty.yml",
-            "testVariable_getOldWay"        => "variables-empty.yml",
-            "default"                       => "variables.yml"
-        );
-        if (isset($list[$this->getName()])) {
-            $dataset_file = $list[$this->getName()];
-        } else {
-            $dataset_file = "variables.yml";
-        }
-        return parent::loadDataSet($dataset_file);
-
-    } 
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        parent::setUp();
-        $this->object = new m_variables;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-        parent::tearDown();
-    }
-
-    /**
-     * @covers m_variables::variable_init
-     * @depends testGet_impersonated
-     */
-    public function testVariable_init($variables)
-    {
-        $this->object->variable_init();
-        global $conf;
-        $this->assertTrue(is_array($conf));
-    }
-
-    /**
-     * @covers m_variables::get_impersonated
-     */
-    public function testGet_impersonated()
-    {
-        $variables = $this->object->get_impersonated();
-        return $variables;
-    }
-
-    /**
-     * @covers m_variables::variable_init_maybe
-     */
-    public function testVariable_init_maybe()
-    {
-        $this->object->variable_init_maybe();
-        $this->assertTrue( (is_array($this->object->cache_conf) && !empty($this->object->cache_conf)) );
-    }
-
-    /**
-     * @covers m_variables::variable_get
-     */
-    public function testVariable_get()
-    {
-        $result                     = $this->object->variable_get("phpunit");
-        $this->assertStringMatchesFormat("phpunit",$result);
-    }
-    
-    /**
-     * @covers m_variables::variable_get
-     */
-    public function testVariable_getOldWay()
-    {
-
-        $this->object->variable_get('phpunit', 'phpunit-default','phpunit-comment');
-        $result                             = $this->object->variable_get('phpunit');
-        $this->assertSame("phpunit-default",$result);
-        
-    }
-    
-    /**
-     * @covers m_variables::variable_get
-     */
-    public function testVariable_getNewWayString()
-    {
-
-        // New way
-        $this->object->variable_get('phpunit', 'phpunit-default','comment', array('desc'=>'Want a string','type'=>'string'));
-        $result = $this->object->variable_get('phpunit');
-        $this->assertSame("phpunit-default",$result);
-    }
-    
-    /**
-     * @covers m_variables::variable_get
-     */
-    public function testVariable_getNewWayArray()
-    {
-        $phpunitArray = array("ns1"=>'ns1.tld',"ip"=>"1.2.3.4");
-        $this->object->variable_get('phpunit', $phpunitArray,'phpunit-comment', array("ns1"=>array('desc'=>'ns name','type'=>'string'),"ip"=>array("desc"=>"here an ip", "type"=>"ip")));
-        $result = $this->object->variable_get('phpunit');
-        $this->assertSame($phpunitArray,$result);
-    }
-
-    /**
-     * @covers m_variables::variable_update_or_create
-     * @expectedException \Exception
-     */
-    public function testVariable_create_exception()
-    {
-        // Insert key with already existing key : success
-        $result                     = $this->object->variable_update_or_create("phpunit","phpunit-fail","DEFAULT",0);
-    }
-    
-    /**
-     * @covers m_variables::variable_update_or_create
-     */
-    public function testVariable_create()
-    {
-        // Insert key with new key : success
-        $result                     = $this->object->variable_update_or_create("phpunit-success","phpunit","DEFAULT",0);
-        $this->assertTrue($result);
-        $this->assertEquals(2, $this->getConnection()->getRowCount('variable'));
-        
-    }
-
-    /**
-     * @covers m_variables::variable_update_or_create
-     */
-    public function testVariable_update()
-    {
-        $result                     = $this->object->variable_update_or_create("phpunit","phpunit-updated","DEFAULT",0,999);
-        $this->assertTrue($result);
-        $this->assertEquals(1, $this->getConnection()->getRowCount('variable'));
-        $expectedTable              = $this->loadDataSet("variables-updated.yml")->getTable("variable");
-        $currentTable               = $this->getConnection()->createQueryTable('variable', 'SELECT * FROM variable');
-        $this->assertTablesEqual($expectedTable, $currentTable);
-        
-    }
-
-    /**
-     * @covers m_variables::del
-     */
-    public function testDel()
-    {
-        $result                     = $this->object->del(999);
-        $this->assertTrue($result);
-        $this->assertEquals(0, $this->getConnection()->getRowCount('variable'));
-    }
-
-    /**
-     * @covers m_variables::display_valueraw_html
-     */
-    public function testDisplay_valueraw_html()
-    {
-        // Empty string
-        $empty_result = $this->object->display_valueraw_html(null, "phpunit",FALSE);
-        $this->assertStringMatchesFormat("<em>"._("Empty")."</em>",$empty_result);
-        // Empty array
-        $empty_array_result = $this->object->display_valueraw_html(array(), "phpunit",FALSE);
-        $this->assertStringMatchesFormat("<em>"._("Empty array")."</em>",$empty_array_result);
-        // String
-        $value_result = $this->object->display_valueraw_html("value", "phpunit",FALSE);
-        $this->assertStringMatchesFormat($value_result,$value_result);
-        // String
-        $array_result = $this->object->display_valueraw_html(array("value","value"), "phpunit",FALSE);
-        $this->assertStringMatchesFormat("<ul>%s</ul>",$array_result);
-
-    }
-
-    /**
-     * @covers m_variables::display_value_html
-     * @depends testVariables_list
-     */
-    public function testDisplay_value_html( $variables )
-    {
-        $valid_result = $this->object->display_value_html($variables, "DEFAULT", 0, "phpunit",FALSE);
-        $this->assertStringMatchesFormat("phpunit",$valid_result);
-        
-        $invalid_result = $this->object->display_value_html($variables, "DEFAULT", 0, "phpunit-absent",FALSE);
-        $this->assertStringMatchesFormat("<em>"._("None defined")."</em>",$invalid_result);
-        
-    }
-
-    /**
-     * @covers m_variables::variables_list_name
-     * @todo   Implement testVariables_list_name().
-     */
-    public function testVariables_list_name()
-    {
-        $variables = $this->object->variables_list_name();
-        $this->assertTrue(is_array($variables));
-        return $variables;
-    }
-
-    /**
-     * @covers m_variables::variables_list
-     * @todo   Implement testVariables_list().
-     */
-    public function testVariables_list()
-    {
-        $variables = $this->object->variables_list();
-        $this->assertTrue(is_array($variables));
-        return $variables;
-    }
-}

From 19871eb355e0285a82bedd180ce98ecdb48562c7 Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@sonntag.fr>
Date: Thu, 21 Jun 2018 18:02:02 +0200
Subject: [PATCH 22/30] [fix] README adapted to the removal of patches for
 jessie / wheezy

---
 README.md | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 15dfd1d3..0d05c957 100644
--- a/README.md
+++ b/README.md
@@ -19,30 +19,31 @@ This project native tongue is French, and the code is commented in English. The
 
 ## Developper information
 
-* This software is built around a Debian package for Squeeze whose packaging instructions are located in [debian/](debian/) folder
+* This software is built around a Debian package for Stretch whose packaging instructions are located in [debian/](debian/) folder (this package can be installed on Jessie safely too)
 * To **build the packages**, clone this repository in a Debian machine and use `debuild` or `dpkg-buildpackage` from source code root.
-* If you want to **build it for Wheezy**, clone the source and patch it for Wheezy using [wheezy/patch.sh](wheezy/patch.sh) script. You'll be able to use dpkg-buildpackage to build the Wheezy version.
-* If you want to **build it for Jessie**, clone the source and patch it for Wheezy using [wheezy/patch.sh](wheezy/patch.sh) script then patch it for Jessie using [jessie/patch.sh](jessie/patch.sh) script. You'll be able to use dpkg-buildpackage to build the Jessie version.
 
 * The web control panel pages written in PHP are located in [bureau/admin](bureau/admin) and the associated PHP classes doing the stuff are in [bureau/class](bureau/class).
 
 ## Nightly build
 
-We have 3 nightly build repositories:
+We have 1 nightly build repositories:
+* stretch - [stable 3.5](http://stable-3-5.nightly.alternc.org/)
+
+and 3 nightly from former Debian releases (now unmaintained) 
 * jessie - [stable 3.3](http://stable-3-3.nightly.alternc.org/)
 * wheezy - [stable 3.2](http://stable-3-2.nightly.alternc.org/)
 * squeeze - [stable 3.1](http://stable-3-1.nightly.alternc.org/)
 
-To use one of them, create a file named `/etc/apt/sources.list.d/alternc-nightly-stable-3.3.list` (for debian jessie) as follow :
+To use one of them, create a file named `/etc/apt/sources.list.d/alternc-nightly-stable-3.5.list` (for debian Jessie or Stretch) as follow :
 
 ```
- deb http://stable-3-3.nightly.alternc.org/ latest/
+ deb http://stable-3-5.nightly.alternc.org/ latest/
 ```
 
 The repository and the packages are signed by the pgp key of AlternC nightly build user :
 
 ```
-wget http://stable-3-3.nightly.alternc.org/nightly.key -O - | apt-key add - 
+wget http://stable-3-5.nightly.alternc.org/nightly.key -O - | apt-key add - 
 ```
 
 ## License

From eae85dcbe74cdf3abc020ee5e076a31bf2b0e1e0 Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@sonntag.fr>
Date: Thu, 21 Jun 2018 18:02:16 +0200
Subject: [PATCH 23/30] removing patches for jessie / wheezy

---
 jessie/alternc-roundcube.postinst        |  49 --
 jessie/alternc-ssl.install.php           |  67 ---
 jessie/alternc.install                   | 666 -----------------------
 jessie/apache2.conf                      |  81 ---
 jessie/bureau.conf                       |  37 --
 jessie/changelog.diff                    |  13 -
 jessie/control.diff                      |  28 -
 jessie/patch.sh                          |  28 -
 jessie/roundcube-install                 |  98 ----
 jessie/roundcube.config.inc.php          |  83 ---
 jessie/roundcube.password.config.inc.php | 401 --------------
 jessie/ssl.conf                          |  91 ----
 jessie/vhost.conf                        |  25 -
 wheezy/95_alternc.conf                   | 344 ------------
 wheezy/alternc-dict-quota.conf           |  47 --
 wheezy/alternc-sql.conf                  | 137 -----
 wheezy/alternc.install.diff              |  46 --
 wheezy/changelog.diff                    |  13 -
 wheezy/control.diff                      |  49 --
 wheezy/patch.sh                          |  27 -
 20 files changed, 2330 deletions(-)
 delete mode 100644 jessie/alternc-roundcube.postinst
 delete mode 100644 jessie/alternc-ssl.install.php
 delete mode 100644 jessie/alternc.install
 delete mode 100644 jessie/apache2.conf
 delete mode 100644 jessie/bureau.conf
 delete mode 100644 jessie/changelog.diff
 delete mode 100644 jessie/control.diff
 delete mode 100755 jessie/patch.sh
 delete mode 100644 jessie/roundcube-install
 delete mode 100644 jessie/roundcube.config.inc.php
 delete mode 100644 jessie/roundcube.password.config.inc.php
 delete mode 100644 jessie/ssl.conf
 delete mode 100644 jessie/vhost.conf
 delete mode 100644 wheezy/95_alternc.conf
 delete mode 100644 wheezy/alternc-dict-quota.conf
 delete mode 100644 wheezy/alternc-sql.conf
 delete mode 100644 wheezy/alternc.install.diff
 delete mode 100644 wheezy/changelog.diff
 delete mode 100644 wheezy/control.diff
 delete mode 100755 wheezy/patch.sh

diff --git a/jessie/alternc-roundcube.postinst b/jessie/alternc-roundcube.postinst
deleted file mode 100644
index 0d99169d..00000000
--- a/jessie/alternc-roundcube.postinst
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-CONFIGFILE="/etc/alternc/local.sh"
-LOGROTATE="/etc/logrotate.d/roundcube-core"
-
-case "$1" in
-    configure)
-	
-        # add alternc-roundcube user for php-itk special rights
-	if ! getent passwd alternc-roundcube; then
-	    useradd -g nogroup -u 1996 alternc-roundcube -d /usr/share/roundcube
-	fi
-
-	# removed from 3.1 & 3.2 :
-	dpkg-statoverride --list /var/lib/roundcube/temp >/dev/null &&  
-	dpkg-statoverride --remove /var/lib/roundcube/temp
-	chown -R www-data:root /var/lib/roundcube/temp
-	chmod -R 750 /var/lib/roundcube/temp
-
-	dpkg-statoverride --list /etc/roundcube/debian-db.php >/dev/null && 
-	dpkg-statoverride --remove /etc/roundcube/debian-db.php
-	chown -R www-data:root /etc/roundcube/debian-db.php
-	chmod -R 460 /etc/roundcube/debian-db.php
-
-	dpkg-statoverride --list /etc/roundcube/config.inc.php >/dev/null && 
-	dpkg-statoverride --remove /etc/roundcube/config.inc.php
-	chown -R www-data:root /etc/roundcube/config.inc.php
-	chmod -R 460 /etc/roundcube/config.inc.php
-
-	dpkg-statoverride --list /var/log/roundcube >/dev/null && 
-	dpkg-statoverride --remove /var/log/roundcube
-	chown -R www-data:root /var/log/roundcube
-	chmod -R 750 /var/log/roundcube
-
-	echo "**********************************************"
-	echo "*          ALTERNC-ROUNDCUBE:                *"
-	echo "* Please run alternc.install to fully deploy *"
-	echo "**********************************************"
-	;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-#DEBHELPER#
diff --git a/jessie/alternc-ssl.install.php b/jessie/alternc-ssl.install.php
deleted file mode 100644
index ba568910..00000000
--- a/jessie/alternc-ssl.install.php
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/php
-<?php
-/*
-  at alternc.install time
-  synchronize the required domain templates with the current install
-  (do they have php52, roundcube, squirrelmail, etc.?)
- */
-if ($argv[1] == "templates") {
-    // install ssl.conf
-    echo "[alternc-ssl] Installing ssl.conf template\n";
-    copy("/etc/alternc/templates/apache2/mods-available/ssl.conf","/etc/apache2/mods-available/ssl.conf");
-    mkdir("/var/run/alternc-ssl");
-    chown("/var/run/alternc-ssl","alterncpanel");
-    chgrp("/var/run/alternc-ssl","alterncpanel");
-    // replace open_basedir line if necessary : 
-    exec('sed -i -e "s#:/var/run/alternc#:/var/run#" -e "s#:/run/alternc#:/run#" /etc/alternc/apache2.conf /etc/alternc/templates/alternc/apache2.conf');
-}
-
-if ($argv[1] == "before-reload") {
-    // Bootstrap
-    require_once("/usr/share/alternc/panel/class/config_nochk.php");
-
-    echo "[alternc-ssl] Installing domaines-types\n";
-    $db->query("INSERT IGNORE INTO `domaines_type` (name, description, target, entry, compatibility, enable, only_dns, need_dns, advanced ) VALUES
-            ('vhost-ssl', 'Locally hosted forcing HTTPS', 'DIRECTORY', '%SUB% IN A @@PUBLIC_IP@@', 'vhost,url,txt,defmx,defmx2,mx,mx2', 'ALL', 0, 0, 0);");
-
-    $db->query("INSERT IGNORE INTO `domaines_type` (name, description, target, entry, compatibility, enable, only_dns, need_dns, advanced ) VALUES
-            ('vhost-mixssl', 'Locally hosted HTTP and HTTPS', 'DIRECTORY', '%SUB% IN A @@PUBLIC_IP@@', 'vhost,url,txt,defmx,defmx2,mx,mx2', 'ALL', 0, 0, 1);");
-
-    $db->query("INSERT IGNORE INTO `domaines_type` (name, description, target, entry, compatibility, enable, only_dns, need_dns, advanced ) VALUES
-            ('panel-ssl', 'HTTPS AlternC panel access', 'NONE', '%SUB% IN A @@PUBLIC_IP@@', 'txt,mx,mx2,defmx,defmx2', 'ALL', 0, 0, 1);");
-
-    $db->query("INSERT IGNORE INTO `domaines_type` (name, description, target, entry, compatibility, enable, only_dns, need_dns, advanced ) VALUES
-            ('url-ssl', 'URL redirection, HTTP & HTTPS', 'URL', '%SUB% IN A @@PUBLIC_IP@@', 'txt,mx,mx2,defmx,defmx2', 'ALL', 0, 0, 1);");
-
-    $db->query("SELECT * FROM domaines_type WHERE name='roundcube';");
-    if ($db->next_record()) {
-        $db->query("INSERT IGNORE INTO `domaines_type` (name, description, target, entry, compatibility, enable, only_dns, need_dns, advanced ) VALUES
-    ('roundcube-ssl', 'HTTPS Roundcube Webmail', 'NONE', '%SUB% IN A @@PUBLIC_IP@@', 'mx,mx2,defmx,defmx2,txt', 'ALL', 0, 0, 1);");
-    } else {
-        $db->query("DELETE FROM domaines_type WHERE name='roundcube-ssl';");
-        $db->query("UPDATE sub_domaines SET web_action='DELETE' WHERE type='roundcube-ssl';");
-    }
-
-    $db->query("SELECT * FROM domaines_type WHERE name='squirrelmail';");
-    if ($db->next_record()) {
-        $db->query("INSERT IGNORE INTO `domaines_type` (name, description, target, entry, compatibility, enable, only_dns, need_dns, advanced ) VALUES
-            ('squirrelmail-ssl', 'HTTPS Squirrelmail Webmail', 'NONE', '%SUB% IN A @@PUBLIC_IP@@', 'mx,mx2,defmx,defmx2,txt', 'ALL', 0, 0, 1);");
-    } else {
-        $db->query("DELETE FROM domaines_type WHERE name='squirrelmail-ssl';");
-        $db->query("UPDATE sub_domaines SET web_action='DELETE' WHERE type='squirrelmail-ssl';");
-    }
-
-    $db->query("SELECT * FROM domaines_type WHERE name='php52';");
-    if ($db->next_record()) {
-        $db->query("INSERT IGNORE INTO `domaines_type` (name, description, target, entry, compatibility, enable, only_dns, need_dns, advanced ) VALUES
-            ('php52-ssl', 'php52 forcing HTTPS', 'DIRECTORY', '%SUB% IN A @@PUBLIC_IP@@', 'vhost,url,txt,defmx,defmx2,mx,mx2', 'ALL', 0, 0, 0);");
-        $db->query("INSERT IGNORE INTO `domaines_type` (name, description, target, entry, compatibility, enable, only_dns, need_dns, advanced ) VALUES
-            ('php52-mixssl', 'php52 HTTP and HTTPS', 'DIRECTORY', '%SUB% IN A @@PUBLIC_IP@@', 'vhost,url,txt,defmx,defmx2,mx,mx2', 'ALL', 0, 0, 0);");
-    } else {
-        $db->query("DELETE FROM domaines_type WHERE name='php52-ssl';");
-        $db->query("UPDATE sub_domaines SET web_action='DELETE' WHERE type='php52-ssl';");
-        $db->query("DELETE FROM domaines_type WHERE name='php52-mixssl';");
-        $db->query("UPDATE sub_domaines SET web_action='DELETE' WHERE type='php52-mixssl';");
-    }
-
-} // before-reload
diff --git a/jessie/alternc.install b/jessie/alternc.install
deleted file mode 100644
index 95060b7c..00000000
--- a/jessie/alternc.install
+++ /dev/null
@@ -1,666 +0,0 @@
-#!/bin/bash
-
-# ----------------------------------------------------------------------
-# AlternC - Web Hosting System
-# Copyright (C) 2000-2012 by the AlternC Development Team.
-# https://alternc.org/
-# ----------------------------------------------------------------------
-# LICENSE
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License (GPL)
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# To read the license please visit http://www.gnu.org/copyleft/gpl.html
-# ----------------------------------------------------------------------
-# Purpose of file: Main install script, launch it anytime ;) 
-# ----------------------------------------------------------------------
-
-# Somes check before start operations
-if [ `id -u` -ne 0 ]; then
-    echo "must be launched as root"
-    exit 1
-fi
-
-for i in $*; do
-    case "$i" in
-        -f|--force)
-            export force=1; shift;;
-        -s|--slave)
-            export slave=1; shift;;
-        --)
-            break;;
-        *)
-            echo "unknown option $i"; shift;;
-    esac
-done
-
-. /usr/lib/alternc/functions.sh
-
-# Lock the jobs !
-lock_jobs
-
-# hook 
-run-parts --arg=startup /usr/lib/alternc/install.d 
-
-#######################################################################
-# Script configuration
-#
-
-# Configuration template location
-TEMPLATE_DIR="/etc/alternc/templates"
-
-# Find needed configuration files (without the initial '/')
-# replace this one unconditionnally
-CONFIG_FILES="etc/alternc/bureau.conf etc/apache2/envvars etc/alternc/apache2.conf etc/alternc/apache_logformat.conf etc/alternc/phpmyadmin.inc.php"
-
-if [ -e /etc/bind/named.conf ]; then
-    CONFIG_FILES="$CONFIG_FILES etc/bind/named.conf.options"
-fi
-if [ -d /etc/postfix ]; then
-    CONFIG_FILES="$CONFIG_FILES etc/postfix/master.cf etc/postfix/myalias.cf etc/postfix/myrelay.cf
-                  etc/postfix/mydomain.cf etc/postfix/myrelay-domain.cf etc/postfix/mymail2mail.cf etc/postfix/mygid.cf etc/postfix/myquota.cf
-                  etc/postfix/myvirtual.cf etc/postfix/mytransport.cf etc/postfix/sasl/smtpd.conf
-                  etc/alternc/postfix/postfix.cf etc/alternc/postfix/postfix-slave.cf
-                  etc/opendkim.conf etc/default/opendkim"
-fi
-if [ -e /etc/proftpd/proftpd.conf ]; then
-    CONFIG_FILES="$CONFIG_FILES etc/proftpd/proftpd.conf etc/proftpd/welcome.msg etc/proftpd/modules.conf"
-fi
-
-if [ -e /etc/default/saslauthd ]; then
-    CONFIG_FILES="$CONFIG_FILES etc/default/saslauthd"
-fi
-
-if [ -e /etc/dovecot/dovecot.conf ]; then
-    CONFIG_FILES="$CONFIG_FILES etc/dovecot/alternc-sql.conf etc/dovecot/alternc-dict-quota.conf etc/dovecot/conf.d/95_alternc.conf"
-fi
-
-INSTALLED_CONFIG_TAR="/var/lib/alternc/backups/etc-installed.tar.gz"
-
-#######################################################################
-# Look for modified configuration files
-#
-if [ -f "$INSTALLED_CONFIG_TAR" ]; then
-    CHANGED="`env LANG=C tar -zdf "$INSTALLED_CONFIG_TAR" -C / 2> /dev/null | 
-              grep -v 'postfix/main.cf' | grep -v 'Uid differs'|grep -v 'Gid differs'  |grep -v 'Mode differs' | 
-              sed -e 's#^\([^:]*\).*#    /\1#' | sort -u`"
-    if [ ! -z "$CHANGED" ]; then
-        echo "The following configuration files has changed since last AlternC"
-        echo "installation :"
-        echo "$CHANGED"
-        echo ""
-        if [ "$force" = "1" ]; then
-            echo "Replacing them as you requested."
-        else
-            echo "These configuration files should normally be modified by"
-            echo "changing the template in $TEMPLATE_DIR and then calling"
-            echo "$0 to perform the update."
-            echo ""
-            echo "Please examine the situation closely and call '$0 -f'"
-            echo "if you still want to actually overwrite these files."
-            exit 1
-        fi
-    fi
-fi
-
-# Upgrade the DATA and DB SCHEMA
-/usr/share/alternc/install/upgrade_check.sh
-# Launch upgrade of alternc modules 
-run-parts --arg=upgrade /usr/lib/alternc/install.d
-
-
-#######################################################################
-# Prepare template expansions
-#
-
-chown :alterncpanel /etc/alternc/local.sh
-. /etc/alternc/local.sh
-
-# May be missing 
-test -d /var/run/alternc || ( mkdir -p /var/run/alternc && chown alterncpanel:alterncpanel /var/run/alternc )
-
-# Create the target directory
-for i in "$ALTERNC_HTML" "$ALTERNC_MAIL" "$ALTERNC_LOGS" ; do
-  test -d "$i" || mkdir -p "$i"
-done
-
-for i in a b c d e f g h i j k l m n o p q r s t u v w x y z _ 0 1 2 3 4 5 6 7 8 9; do
-  test -d "$ALTERNC_HTML/$i" || ( mkdir -p "$ALTERNC_HTML/$i" && chown alterncpanel:alterncpanel "$ALTERNC_HTML/$i" && chmod 775 "$ALTERNC_HTML/$i" )
-  test -d "$ALTERNC_MAIL/$i" || ( mkdir -p "$ALTERNC_MAIL/$i" && chown vmail:vmail "$ALTERNC_MAIL/$i" && chmod 775 "$ALTERNC_MAIL/$i" )
-done
-
-find $ALTERNC_LOGS -maxdepth 1 -type d -exec chown alterncpanel:adm {} \; 
-find $ALTERNC_HTML -maxdepth 1 -type d -exec chown alterncpanel:alterncpanel {} \; 
-find $ALTERNC_MAIL -maxdepth 1 -type d -exec chown vmail:vmail {} \;
-
-# Check ACL
-aclcheckfile="$ALTERNC_HTML/test-acl"
-touch "$aclcheckfile"
-setfacl -m u:root:rwx "$aclcheckfile" 2>/dev/null || ( echo "Error : ACL aren't activated on $ALTERNC_HTML . AlternC can't work without it." ; test -e "$aclcheckfile" && rm -f "$aclcheckfile" ; exit 2)
-test -e "$aclcheckfile" && rm -f "$aclcheckfile"
-
-# XXX: copy-paste from debian/config
-if [ -r /etc/alternc/my.cnf ]; then
-    # make mysql configuration available as shell variables
-    # to convert from .cnf to shell syntax, we:
-    # * match only lines with "equal" in them (/=/)
-    # * remove whitespace around the = and add a left quote operator ' (;s)
-    # * add a right quote operator at the end of line (;s)
-    # * convert mysql variables into our MYSQL_ naming convention (;s)
-    # * print the result (;p)
-    eval `sed -n -e "/=/{s/ *= *\"\?/='/;s/\"\?\$/'/;s/host/MYSQL_HOST/;s/user/MYSQL_USER/;s/password/MYSQL_PASS/;s/database/MYSQL_DATABASE/;p}" /etc/alternc/my.cnf`
-    chown root:alterncpanel /etc/alternc/my.cnf
-    chmod 640 /etc/alternc/my.cnf
-fi
-
-if [ -r /etc/alternc/my_mail.cnf ]; then
-    # make mysql configuration available as shell variables
-    # to convert from .cnf to shell syntax, we:
-    # * match only lines with "equal" in them (/=/)
-    # * remove whitespace around the = and add a left quote operator ' (;s)
-    # * add a right quote operator at the end of line (;s)
-    # * convert mysql variables into our MYSQL_ naming convention (;s)
-    # * print the result (;p)
-    eval `sed -n -e "/=/{s/ *= *\"\?/='/;s/\"\?\$/'/;s/host/MYSQL_HOST/;s/user/MYSQL_MAIL_USER/;s/password/MYSQL_MAIL_PASS/;s/database/MYSQL_DATABASE/;p}" /etc/alternc/my_mail.cnf`
-    chown root:alterncpanel /etc/alternc/my_mail.cnf
-    chmod 640 /etc/alternc/my_mail.cnf
-fi
-
-WARNING="WARNING: Do not edit this file, edit the one in /etc/alternc/templates and launch alternc.install again."
-
-if [ "$slave" = "1" ]; then
-    VERSION="`dpkg -s alternc-slave | sed -n -e 's/^Version: \(.*\)/\1/p'`"
-else
-    VERSION="`dpkg -s alternc | sed -n -e 's/^Version: \(.*\)/\1/p'`"
-fi
-
-# /var/ alternc/dns/d/www.example.com
-FQDN_LETTER="`echo $FQDN | sed -e 's/.*\.\([^\.]\)[^\.]*\.[^\.]*$/\1/'`"
-if [ "$FQDN_LETTER" = "$FQDN" ] 
-then
-       FQDN_LETTER="_" 
-fi
-
-NS2_IP=`perl -e "\\$h = (gethostbyname(\"$NS2_HOSTNAME\"))[4];
-                 @ip = unpack('C4', \\$h);
-                 print join (\".\", @ip);"`
-
-if [ -z "$MONITOR_IP" ]; then
-    MONITOR_IP="127.0.0.1"
-fi
-
-PUBLIC_IP_BEGIN=$(echo $PUBLIC_IP|cut -c 1)
-
-# Secret for PhpMyAdmin sessions
-PHPMYADMIN_BLOWFISH="$(generate_string 24)"
-
-# XXX: I assume this is secure if /tmp is sticky (+t)
-# we should have a better way to deal with templating, of course.
-SED_SCRIPT="/tmp/alternc.install.sedscript"
-cat > $SED_SCRIPT <<EOF
-s\\%%hosting%%\\$HOSTING\\;
-s\\%%fqdn%%\\$FQDN\\;
-s\\%%public_ip%%\\$PUBLIC_IP\\;
-s\\%%public_ip_begin%%\\$PUBLIC_IP_BEGIN\\;
-s\\%%internal_ip%%\\$INTERNAL_IP\\;
-s\\%%monitor_ip%%\\$MONITOR_IP\\;
-s\\%%ns1%%\\$NS1_HOSTNAME\\;
-s\\%%ns2%%\\$NS2_HOSTNAME\\;
-s\\%%mx%%\\$DEFAULT_MX\\;
-s\\%%dbhost%%\\$MYSQL_HOST\\;
-s\\%%dbname%%\\$MYSQL_DATABASE\\;
-s\\%%dbuser%%\\$MYSQL_USER\\;
-s\\%%dbpwd%%\\$MYSQL_PASS\\;
-s\\%%db_mail_user%%\\$MYSQL_MAIL_USER\\;
-s\\%%db_mail_pwd%%\\$MYSQL_MAIL_PASS\\;
-s\\%%warning_message%%\\$WARNING\\;
-s\\%%fqdn_lettre%%\\$FQDN_LETTER\\;
-s\\%%version%%\\$VERSION\\;
-s\\%%ns2_ip%%\\$NS2_IP\\;
-s\\%%ALTERNC_HTML%%\\$ALTERNC_HTML\\;
-s\\%%ALTERNC_MAIL%%\\$ALTERNC_MAIL\\;
-s\\%%ALTERNC_LOGS%%\\$ALTERNC_LOGS\\;
-s\\%%PHPMYADMIN_BLOWFISH%%\\$PHPMYADMIN_BLOWFISH\\;
-EOF
-
-# hook 
-test -d /usr/lib/alternc/install.d || mkdir -p /usr/lib/alternc/install.d
-run-parts --arg=templates /usr/lib/alternc/install.d 
-
-
-######################################################################
-# Backup the Main database
-DB_BACKUP="/var/lib/alternc/backups/${MYSQL_DATABASE}-db-`date +%Y%m%d-%H:%M:%S`.gz"
-db_dump="mysqldump --defaults-file=/etc/alternc/my.cnf --add-drop-table --allow-keywords --quote-names --force --quick --add-locks --lock-tables --extended-insert ${MYSQL_DATABASE}"
-$db_dump | /bin/gzip -c > $DB_BACKUP || echo "backup of the main database failed"
-
-#######################################################################
-# Backup configuration files
-#
-BACKUP_FILE="/var/lib/alternc/backups/etc-original-`date +%Y%m%d-%H%M`.tar.gz"
-
-# Only backup what we are really going to replace
-BACKUPS=""
-for file in $CONFIG_FILES; do
-    TEMPLATE="$TEMPLATE_DIR/${file##etc/}"
-    if [ -f "$TEMPLATE" ]; then
-        BACKUPS="$BACKUPS $file"
-    fi
-done
-
-# also backup main.cf since we're doing major changes to it
-BACKUPS="$BACKUPS etc/postfix/main.cf"
-
-tar -zcf "$BACKUP_FILE" -C / $BACKUPS 2>/dev/null || true
-chmod 600 "$BACKUP_FILE"
-
-#######################################################################
-# Expand templates in the right place
-#
-echo -n "Expanding variables in configuration files:"
-for file in $CONFIG_FILES; do
-    TEMPLATE="$TEMPLATE_DIR/${file##etc/}"
-    echo -n " $file"
-    if [ -f "$TEMPLATE" ]; then
-        sed -f "$SED_SCRIPT" < $TEMPLATE > /$file
-    fi
-done
-echo "."
-rm -f $SED_SCRIPT
-
-######################################################################## 
-# Ad-hoc fixes
-#
-
-php="`ls /usr/lib/apache*/*/*php*.so | sed -e 's/^.*libphp\(.*\)\.so$/\1/' | tail -1`"
-if [ "$php" = "7.0" ]
-then
-    ln -fs /etc/alternc/alternc.ini /etc/php/$php/apache2/conf.d/alternc.ini || true
-    ln -fs /etc/alternc/alternc.ini /etc/php/$php/cli/conf.d/alternc.ini || true
-else
-    ln -fs /etc/alternc/alternc.ini /etc/php$php/apache2/conf.d/alternc.ini || true
-    ln -fs /etc/alternc/alternc.ini /etc/php$php/cli/conf.d/alternc.ini || true
-fi
-
-if [ -x /usr/sbin/apache2 ]; then
-    # hook 
-    run-parts --arg=apache2 /usr/lib/alternc/install.d 
-    a2enmod mpm_itk
-    
-    s=""
-    # unused from AlternC 1.0, FIXME: remove it later
-    if [ -L /etc/apache2/mods-enabled/vhost_alias.load ]
-    then
-        a2dismod vhost_alias
-        s="apache2"
-    fi 
-    if ! [ -L /etc/apache2/mods-enabled/php$php.load ]
-    then
-	    a2enmod php$php
-    fi
-    if ! [ -L /etc/apache2/mods-enabled/rewrite.load ]
-    then
-	    a2enmod rewrite
-    fi
-    if [ -e /etc/alternc/apache.pem ]; then
-        # We enable proftpd tls module
-        cat /etc/proftpd/modules.conf | sed -e 's/^#LoadModule mod_tls.c/LoadModule mod_tls.c/' > /etc/proftpd/modules.conf.alternc-new
-        mv /etc/proftpd/modules.conf.alternc-new /etc/proftpd/modules.conf 
-        cp /etc/proftpd/modules.conf /etc/alternc/templates/proftpd/
-        # We enable apache2 SSL : 
-        if [ ! -L /etc/apache2/mods-enabled/ssl.load ] ; then
-            a2enmod ssl
-            s="apache2"
-        fi
-        if [ ! -h /etc/apache2/conf-available/alternc-ssl.conf ] && [ -e /etc/apache2/conf-available/ ]; then
-            ln -sf /etc/alternc/apache2-ssl.conf /etc/apache2/conf-available/alternc-ssl.conf
-	    a2enconf alternc-ssl
-            s="apache2"
-        fi
-
-	# We enable dovecot SSL certificate instructions: (on wheezy we should use a new file in /etc/dovecot/conf.d/ )
-	( echo "# Don't change this file, it will be overwriten by alternc.install. Change ssl parameters in a file named 99_ssl.conf instead" ; echo "ssl_cert = </etc/alternc/apache.pem" ; echo "ssl_key = </etc/alternc/apache.pem" ) >/etc/dovecot/conf.d/96_ssl.conf
-
-    else
-        # We disable proftpd tls module
-        cat /etc/proftpd/modules.conf | sed -e 's/^LoadModule mod_tls.c/#LoadModule mod_tls.c/' > /etc/proftpd/modules.conf.alternc-new
-        mv /etc/proftpd/modules.conf.alternc-new /etc/proftpd/modules.conf 
-        cp /etc/proftpd/modules.conf /etc/alternc/templates/proftpd/
-
-	# We disable dovecot SSL certificate instructions: (on wheezy we should remove a file in /etc/dovecot/conf.d/ )
-	( echo "# Don't change this file, it will be overwriten by alternc.install. Change ssl parameters in a file named 99_ssl.conf instead" ; echo "ssl_cert = </etc/ssl/certs/ssl-cert-snakeoil.pem" ; echo "ssl_key = </etc/ssl/private/ssl-cert-snakeoil.key" ) >/etc/dovecot/conf.d/96_ssl.conf
-
-        echo "SSL not configured"
-        echo "create a certificate in /etc/alternc/apache.pem and rerun alternc.install"
-    fi
-    if [ ! -h /etc/apache2/conf-available/alternc.conf ] && [ -e /etc/apache2/conf-available/ ]; then
-        ln -sf /etc/alternc/apache2.conf /etc/apache2/conf-available/alternc.conf
-	a2enconf alternc.conf
-        s="apache2"
-    fi
-    if [ -e /etc/apache2/sites-enabled/000-default.conf ]; then
-        a2dissite 000-default
-        s="apache2"
-    fi
-    SERVICES="$SERVICES $s"
-fi
-
-# Manage sudoers.d include appearing in Squeeze:
-# if the "includedir" is not here, we add it ONLY IF visudo -c is happy.
-if ! grep -q "#includedir */etc/sudoers.d" /etc/sudoers ; then
-    if ! cat /etc/sudoers.d/* | visudo -c -f -  >/dev/null ; then
-	echo -e "\033[31m**********************************************"
-	echo "*                                            *"
-	echo "*   ALTERNC  ACTION REQUESTED                *"
-	echo "*                                            *"
-	echo "* SUDO is NOT configured properly            *"
-	echo "* check your files in /etc/sudoers.d !       *" 
-	echo "* then launch alternc.install again          *"
-	echo "*                                            *"
-	echo "**********************************************"
-	echo -e "\033[0m"
-	exit 1
-    else 
-	echo "#includedir */etc/sudoers.d" >>/etc/sudoers
-    fi
-fi
-
-# Copy postfix *_checks if they do not exist
-for file in body_checks header_checks; do
-    if [ ! -e "/etc/postfix/$file" ]; then
-        cp /usr/share/alternc/install/$file /etc/postfix
-    fi
-done
-
-# Attribute the correct rights to critical postfix files
-if [ -e /etc/postfix/myalias.cf -o -e /etc/postfix/mydomain.cf -o -e /etc/postfix/mygid.cf -o -e /etc/postfix/myrelay-domain.sh -o -e /etc/postfix/myvirtual.cf -o -e /etc/postfix/myrelay.cf -o -e /etc/postfix/myquota.cf ]; then
-    chown root:postfix /etc/postfix/my*
-    chmod 640 /etc/postfix/my*
-fi
-
-if [ ! -f /etc/postfix/main.cf ]
-then
-    echo -e "\033[31m**********************************************"
-    echo "*                                            *"
-    echo "*   ALTERNC  ACTION REQUESTED                *"
-    echo "*                                            *"
-    echo "* POSTFIX is NOT configured properly         *"
-    echo "* launch dpkg-reconfigure -plow postfix      *" 
-    echo "* and choose 'Internet Site'                 *"
-    echo "* then launch alternc.install again          *"
-    echo "*                                            *"
-    echo "**********************************************"
-    echo -e "\033[0m"
-    exit 1
-fi
-
-# configure Postfix appropriatly for our needs
-if [ "$slave" = "1" ]; then
-    postfix_conf=/etc/alternc/postfix/postfix-slave.cf
-else
-    postfix_conf=/etc/alternc/postfix/postfix.cf
-fi
-grep -v '^\ *#' $postfix_conf |while read line ; do
-   if echo "$line" | grep -qi '^smtpd_tls_dcert_file' ;then
-     line_strip=`echo "$line"|tr -d '[:blank:]'`
-     pattern="*="
-     cert_file=${line_strip#$pattern}
-     echo $cert_file
-     echo $line
-     echo $line_strip
-     if [ -e $cert_file ];then
-        postconf -e "$line"
-     else
-        echo -e "\033[31m*****************************************************"
-        echo "* The certificate file : $cert_file does not exists *"
-	echo "* If you want to be able to use SSL/TLS             *"
-        echo "* please go to https://alternc.com/SSL              *"
-	echo "* to get information on how to create a certificate *"
-        echo "* Finally relaunch alternc.install                  *"
-        echo "*****************************************************"
-	echo -e "\033[0m"
-     fi
-  else
-        postconf -e "$line"
-  fi
-done
-
-# Conviguring delivery used by Postfix
-/usr/lib/alternc/alternc_add_policy_dovecot
-
-# Bug #1215: configure mydestination when $FQDN is not in
-OLDDESTINATION=`postconf mydestination | awk -F '=' '{print $2}'`
-echo "$OLDDESTINATION" | grep -q -v "$FQDN" && postconf -e "mydestination = $FQDN, $OLDDESTINATION"
-
-# Remove phpmyadmin apache2 configuration
-a2disconf phpmyadmin
-
-# Configure PHPMyAdmin
-include_str='include("/etc/alternc/phpmyadmin.inc.php")'
-pma_config='/etc/phpmyadmin/config.inc.php'
-
-# Sur une configuration vierge, inclure la configuration alternc
-if ! grep -e "${include_str/\"/\\\"}" $pma_config > /dev/null 2>&1; then
-    echo "$include_str;" >> $pma_config
-fi
-
-# Le template de /etc/alternc/phpmyadmin.inc.php viens d'être réappliqué, on 
-# regénére la liste des serveurs MySQL disponible dedans.
-mysql_query "select id,host,name from db_servers;" | while read id host name ; do
-echo "
-// Server #$id in db_servers
-\$i++;
-\$cfg['Servers'][\$i]['connect_type']  = 'tcp';    // How to connect to MySQL server ('tcp' or 'socket')
-\$cfg['Servers'][\$i]['auth_type']     = 'cookie';    // Authentication method (config, http or cookie based)?
-\$cfg['Servers'][\$i]['hide_db']       = 'information_schema';
-\$cfg['Servers'][\$i]['verbose']       = '$name'; // human name
-\$cfg['Servers'][\$i]['host']          = '$host'; // MySQL hostname or IP address
-" >> '/etc/alternc/phpmyadmin.inc.php'
-done
-
-# Reload incron. Useless, but who know?
-SERVICES="$SERVICES incron"
- 
-if [ -e /etc/proftpd.conf ] ; then
-    chmod 640 /etc/proftpd/proftpd.conf
-fi
-
-if [ -x /usr/sbin/locale-gen ] ; then
-    touch /etc/locale.gen
-    LOCALECHANGED=""
-    # Add de_DE ISO-8859-1, en_US ISO-8859-1, es_ES ISO-8859-1, fr_FR ISO-8859-1 to the locales : 
-    if ! grep -q "^de_DE ISO-8859-1$" /etc/locale.gen ; then
-	echo "de_DE ISO-8859-1" >>/etc/locale.gen
-	LOCALECHANGED=1
-    fi
-    if ! grep -q "^en_US ISO-8859-1$" /etc/locale.gen ; then
-	echo "en_US ISO-8859-1" >>/etc/locale.gen
-	LOCALECHANGED=1
-    fi
-    if ! grep -q "^es_ES ISO-8859-1$" /etc/locale.gen ; then
-	echo "es_ES ISO-8859-1" >>/etc/locale.gen
-	LOCALECHANGED=1
-    fi
-    if ! grep -q "^fr_FR ISO-8859-1$" /etc/locale.gen ; then 
-	echo "fr_FR ISO-8859-1" >>/etc/locale.gen
-	LOCALECHANGED=1
-    fi
-    if ! grep -q "^de_DE.UTF-8 UTF-8$" /etc/locale.gen ; then
-	echo "de_DE.UTF-8 UTF-8" >>/etc/locale.gen
-	LOCALECHANGED=1
-    fi
-    if ! grep -q "^fr_FR.UTF-8 UTF-8$" /etc/locale.gen ; then
-	echo "fr_FR.UTF-8 UTF-8" >>/etc/locale.gen
-	LOCALECHANGED=1
-    fi
-    if ! grep -q "^es_ES.UTF-8 UTF-8$" /etc/locale.gen ; then
-	echo "es_ES.UTF-8 UTF-8" >>/etc/locale.gen
-	LOCALECHANGED=1
-    fi
-    if ! grep -q "^en_US.UTF-8 UTF-8$" /etc/locale.gen ; then
-	echo "en_US.UTF-8 UTF-8" >>/etc/locale.gen
-	LOCALECHANGED=1
-    fi
-    if ! grep -q "^it_IT.UTF-8 UTF-8$" /etc/locale.gen ; then
-	echo "it_IT.UTF-8 UTF-8" >>/etc/locale.gen
-	LOCALECHANGED=1
-    fi
-    if ! grep -q "^nl_NL.UTF-8 UTF-8$" /etc/locale.gen ; then
-	echo "nl_NL.UTF-8 UTF-8" >>/etc/locale.gen
-	LOCALECHANGED=1
-    fi
-    if [ "$LOCALECHANGED" ] ; then
-	locale-gen
-    fi
-fi
-
-# remaining steps are only for the master
-if [ "$slave" = "1" ]; then
-    exit 0
-fi
-
-#######################################################################
-# populate alternc database with the mailname used by postfix to send mail for each vhost
-#
-# If mailname does not exist, create it. Fix #1495
-test -e "/etc/mailname" || hostname -f > "/etc/mailname" 
-# Allow for all the users to view /etc/mailname
-chmod +r "/etc/mailname"
-
-#######################################################################
-# Save installed files to check them during next install
-#
-tar -zcf "$INSTALLED_CONFIG_TAR" -C / $CONFIG_FILES
-
-#######################################################################
-# Last touches
-#
-
-find $ALTERNC_HTML -maxdepth 1 -type d -exec setfacl -b -k -m d:g:alterncpanel:-wx -m d:u:alterncpanel:-wx -m u:alterncpanel:-wx -m g:alterncpanel:-wx {} \;
-
-#creating log file
-if [ ! -e "/var/log/alternc/bureau.log" ]; then
-  test -d "/var/log/alternc/" || mkdir -p "/var/log/alternc/"
-  touch "/var/log/alternc/bureau.log"
-fi
-
-if [ ! -e "/var/log/alternc/update_domains.log" ]; then
-  test -d "/var/log/alternc/" || mkdir -p "/var/log/alternc/"
-  touch "/var/log/alternc/update_domains.log"
-fi
-
-# Be sure of the owner of the logs files
-chmod 640 /var/log/alternc/bureau.log /var/log/alternc/update_domains.log
-chown alterncpanel:adm /var/log/alternc/bureau.log /var/log/alternc/update_domains.log
-
-# Creating admin user if needed
-HAS_ROOT=`mysql --defaults-file=/etc/alternc/my.cnf -e "SELECT COUNT(*) FROM membres WHERE login = 'admin' OR login = 'root' and su = 1" | tail -1`
-
-if [ "$HAS_ROOT" != "1" ]; then
-    echo "Creating admin user..."
-    echo ""
-
-    if su - alterncpanel -s /bin/bash -c /usr/share/alternc/install/newone.php
-      then
-      echo "*******************************************"
-      echo "*                                         *"
-      echo "*               Admin account             *"
-      echo "*               ------------              *"
-      echo "*                                         *"
-      echo "* user: admin             password: admin *"
-      echo "*                                         *"
-      echo "* Please change this as soon as possible! *"
-      echo "*                                         *"
-      echo "*******************************************"
-    else
-	echo "Unable to create the first AlternC account (named 'admin'). newone.php returned $?. Check your MySQL database, PHP, and the /etc/alternc/local.sh file. Also check for any error above during install."
-    fi
-else
-    ##UPDATE default db_server following /etc/alternc/my.cnf values
-    if [ "$MYSQL_HOST" == "localhost" ]; then
-        MYSQL_HOST_CLIENT="localhost"
-    else
-        MYSQL_HOST_CLIENT="%"
-    fi
-    mysql --defaults-file=/etc/alternc/my.cnf -e "UPDATE db_servers SET host='$MYSQL_HOST', login='$MYSQL_USER', password='$MYSQL_PASS', client='$MYSQL_HOST_CLIENT' WHERE name='Default';"
-fi
-
-# giving vmail user read access on dovecot sql file
-chgrp vmail /etc/dovecot/alternc-sql.conf
-chmod g+r /etc/dovecot/alternc-sql.conf
-# Override some dovecot 2.0 configuration that may have happened during dovecot postinst:
-sed -i -e 's/^ *!include/#!include/' /etc/dovecot/conf.d/10-auth.conf
-
-# Changing owner of web panel's files
-chown -R alterncpanel:alterncpanel "/usr/share/alternc/panel/"
-
-# We force the re-computing of the DNS zones, since we may have changed the IP address (see #460)
-/usr/bin/mysql --defaults-file="/etc/alternc/my.cnf" -B -e "update domaines set dns_action='UPDATE' WHERE gesdns=1;"
-
-# We ensure localhost is trusted to opendkim
-mkdir -p "/etc/opendkim/keys"
-touch /etc/opendkim/TrustedHosts /etc/opendkim/SigningTable /etc/opendkim/KeyTable
-grep -q "^127.0.0.1\$" /etc/opendkim/TrustedHosts || echo "127.0.0.1" >>/etc/opendkim/TrustedHosts
-grep -q "^localhost\$" /etc/opendkim/TrustedHosts || echo "localhost" >>/etc/opendkim/TrustedHosts
-grep -q "^$PUBLIC_IP\$" /etc/opendkim/TrustedHosts || echo "$PUBLIC_IP" >>/etc/opendkim/TrustedHosts
-
-# Add opendkim to service to restart
-SERVICES="$SERVICES opendkim bind9"
-
-# hook 
-run-parts --arg=before-reload /usr/lib/alternc/install.d 
-
-#######################################################################
-# Reload services
-#
-for service in postfix dovecot cron proftpd ; do
-    invoke-rc.d $service force-reload || true
-done
-
-# We should restart apaches after all configuration stuff ...
-for service in $SERVICES; do
-    test -x /etc/init.d/$service && invoke-rc.d $service stop || true
-done
-
-# on Jessie, apache2 does not stop/start properly due to "service" and "apache2ctl" having different behavior pid-file-wise
-killall apache2 
-
-for service in $SERVICES; do
-    test -x /etc/init.d/$service && invoke-rc.d $service start || true
-done
-
-echo "Fix all the permission. May be quite long..."
-echo "YOU CAN INTERUPT THIS BY USING Ctrl-c THEN y TO BYPASS THE ERROR." 
-/usr/lib/alternc/fixperms.sh
-echo "Compile PO files"
-
-# TODO : includes the .MO in debian package ;) 
-find /usr/share/alternc/panel/locales -maxdepth 1 -mindepth 1 -type d -name "*_*" | while read A
-do 
-    B="$A/LC_MESSAGES"
-    cd $B
-    rm -f alternc.mo alternc.po
-    msgcat --use-first *.po alternc >alternc.po
-    msgfmt alternc.po -o alternc.mo
-done
-
-# Fix some perms
-# Fix phpmyadmin import trac#1557
-test -d "/var/lib/phpmyadmin/tmp" && dpkg-statoverride --update --add www-data alterncpanel 0775 "/var/lib/phpmyadmin/tmp" 2>/dev/null || true
-test -f "/etc/phpmyadmin/config-db.php" && dpkg-statoverride --update --add www-data alterncpanel 0644 "/etc/phpmyadmin/config-db.php" 2>/dev/null || true
-
-# hook 
-run-parts --arg=end /usr/lib/alternc/install.d 
-
-# Unlock jobs !
-unlock_jobs
-
-# Rebuild all web configuration
-/usr/lib/alternc/rebuild_all_webconf.sh --force
diff --git a/jessie/apache2.conf b/jessie/apache2.conf
deleted file mode 100644
index 0732de07..00000000
--- a/jessie/apache2.conf
+++ /dev/null
@@ -1,81 +0,0 @@
-# AUTO GENERATED FILE
-# Modify template in /etc/alternc/templates/
-# and launch alternc.install if you want 
-# to modify this file.
-#
-# This module is loaded in /etc/apache/modules, and enabled by apache-modconf 
-# LoadModule vhost_alias_module /usr/lib/apache/1.3/mod_vhost_alias.so
-
-# Define the default user and group for mpm-itk
-AssignUserId www-data www-data
-
-# Deny access to the root filesystem
-<Directory />
-  Options +FollowSymLinks
-  AllowOverride None
-  Order allow,deny
-  Deny from all
-</Directory>
-#### End security parameters
-
-ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
-<Directory "/usr/lib/cgi-bin">
-  AllowOverride None
-  Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
-  Order allow,deny
-  Allow from all
-</Directory>
-
-
-<Directory /usr/share/alternc/panel/admin/>
-  Order allow,deny
-  Allow from all
-
-  php_admin_flag safe_mode_gid off
-  php_admin_flag safe_mode off
-  AddDefaultCharset UTF-8
-# open_basedir allows access to specifics directories. We need to grant access to these directories for alternc, awstats, mailman...
-  php_admin_value open_basedir /usr/share/alternc-mailman/patches/:/etc/alternc/:/run/alternc:/var/run/alternc/:/usr/share/alternc/panel/:%%ALTERNC_HTML%%/:/tmp:/usr/share/php/:/var/cache/alternc-webalizer/:/etc/locale.gen:%%ALTERNC_LOGS%%:/etc/awstats/:/var/log/alternc/:/var/lib/alternc/panel/
-
-</Directory>
-
-
-<Directory %%ALTERNC_HTML%% >
-  AllowOverride AuthConfig FileInfo Limit Options Indexes
-  Options -Indexes +Includes -FollowSymLinks +MultiViews +SymLinksIfOwnerMatch
-  Order allow,deny
-  Allow from all
-  php_admin_flag safe_mode_gid off
-  php_admin_flag safe_mode off
-  php_admin_flag enable_dl off
-
-  php_admin_value disable_functions chmod,chown,chgrp,link,symlink
-  php_admin_value safe_mode_exec_dir /usr/lib/alternc/safe_mode_exec_dir
-  php_admin_value disable_functions chgrp,link,symlink
-  php_admin_value sendmail_path /usr/lib/alternc/sendmail
-
-  # Default upload_tmp_dir is /tmp . Be carefull, this value MUST be surcharged
-  # by the vhost to be a directory INSIDE the home of the user. If you don't do
-  # that, ACLs could be "strange" or inexistent.
-  php_admin_value upload_tmp_dir /tmp 
-</Directory>
-
-<Directory /usr/share/phpmyadmin>
-  AllowOverride AuthConfig Options FileInfo Limit Indexes
-  Options +Indexes +Includes +FollowSymLinks +MultiViews
-  Order allow,deny
-  Allow from all
-</Directory>
-<Directory /usr/share/squirrelmail>
-  AllowOverride AuthConfig Options FileInfo Limit Indexes
-  Options +Indexes +Includes +FollowSymLinks +MultiViews
-  Order allow,deny
-  Allow from all
-</Directory>
-
-<VirtualHost *:80>
-  Include /etc/alternc/bureau.conf
-</VirtualHost>
-
-# Now we include all the generated configuration
-Include /var/lib/alternc/apache-vhost/vhosts_all.conf
diff --git a/jessie/bureau.conf b/jessie/bureau.conf
deleted file mode 100644
index 65bca635..00000000
--- a/jessie/bureau.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-
-  AssignUserId alterncpanel alterncpanel
-  SetEnv LOGIN "0000-panel"
-
-  DocumentRoot /usr/share/alternc/panel/admin
-  ServerName %%fqdn%%
-
-  # Mail autoconfig
-  ServerAlias autoconfig.*
-  ServerAlias autodiscover.*
-
-  RewriteEngine on
-  RewriteRule   ^/admin/(.*)  /$1 [R=301,L]
-  
-  alias /alternc-sql      /usr/share/phpmyadmin
-
-  RewriteEngine On
-  RewriteRule ^webmail /webmail-redirect.php [L]
-
-  # Mail autoconfig
-  RewriteRule ^/mail/mailautoconfig.xml$ /mailautoconfig_thunderbird.php [L]
-  RewriteRule ^/mail/config-v1.1.xml$ /mailautoconfig_thunderbird.php [L]
-  RewriteRule ^mail/mailautoconfig.xml$ /mailautoconfig_thunderbird.php [L]
-  RewriteRule ^mail/config-v1.1.xml$ /mailautoconfig_thunderbird.php [L]
-  RewriteRule ^/autodiscover/autodiscover.xml$ /mailautoconfig_outlook.php [L]
-  RewriteRule ^/Autodiscover/Autodiscover.xml$ /mailautoconfig_outlook.php [L]
-  RewriteRule ^/Autodiscover.xml$ mailautoconfig_outlook.php [L]
-  RewriteRule ^/autodiscover.xml$ mailautoconfig_outlook.php [L]
-  RewriteRule ^autodiscover/autodiscover.xml$ /mailautoconfig_outlook.php [L]
-  RewriteRule ^Autodiscover/Autodiscover.xml$ /mailautoconfig_outlook.php [L]
-  RewriteRule ^Autodiscover.xml$ mailautoconfig_outlook.php [L]
-  RewriteRule ^autodiscover.xml$ mailautoconfig_outlook.php [L]
-
-
-  # will be used to define aliases such as /javascript /webmail /squirrelmail ...
-  IncludeOptional /etc/alternc/apache-panel.d/*.conf
-
diff --git a/jessie/changelog.diff b/jessie/changelog.diff
deleted file mode 100644
index 017bbc43..00000000
--- a/jessie/changelog.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- changelog	2014-06-24 13:42:50.234304438 +0200
-+++ changelog.wheezy	2014-06-24 13:43:51.978313552 +0200
-@@ -1,1 +1,8 @@
-+alternc (3.3.10) stable; urgency=low
-+
-+  * Version identical to 3.1 for Squeeze
-+  * Includes small patches / dependency for apache & dovecot 2.0 for Jessie
-+
-+ -- Benjamin Sonntag <benjamin@sonntag.fr>  Fri, 15 Jan 2016 15:26:00 +0100
-+
- alternc (3.2.10) oldstable; urgency=low
-
-  * Version identical to 3.1 for Squeeze
diff --git a/jessie/control.diff b/jessie/control.diff
deleted file mode 100644
index 2b8b28ee..00000000
--- a/jessie/control.diff
+++ /dev/null
@@ -1,28 +0,0 @@
---- control.wheezy	2017-10-06 12:13:49.765062335 +0200
-+++ control	2017-10-06 12:15:52.021333089 +0200
-@@ -38,9 +38,9 @@
-        , sudo
-        , adduser
-        , dnsutils
--       , dovecot-common (>=1:2.1.7)
--       , dovecot-imapd
--       , dovecot-pop3d
-+       , dovecot-core (>=1:2.1.7)
-+       , dovecot-imapd (>=1:2.1.7)
-+       , dovecot-pop3d (>=1:2.1.7)
-        , dovecot-mysql
-        , vlogger
-        , mailutils | mailx
-@@ -126,9 +126,9 @@
-          , gettext (>= 0.10.40-5)
-          , adduser
-          , sudo
--         , dovecot-common (>=1:2.1.7)
--         , dovecot-imapd
--         , dovecot-pop3d
-+         , dovecot-core (>=1:2.1.7)
-+         , dovecot-imapd (>=1:2.1.7)
-+         , dovecot-pop3d (>=1:2.1.7)
-          , dovecot-mysql
-          , vlogger
-          , mailutils | mailx
diff --git a/jessie/patch.sh b/jessie/patch.sh
deleted file mode 100755
index 65434bc0..00000000
--- a/jessie/patch.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-# Migrate a repository to WHEEZY
-
-# DON'T COMMIT ANYTHING AFTER launching this
-# reset your subversion repos back to the serverside one!
-
-cd `dirname $0` 
-
-pushd ../debian 
-patch <../jessie/control.diff
-patch <../jessie/changelog.diff
-popd
-
-cp vhost.conf ../etc/alternc/templates/apache2/
-cp bureau.conf ../etc/alternc/templates/alternc/
-cp alternc.install ../install/
-cp apache2.conf ../etc/alternc/templates/alternc/
-# alternc-roundcube package : 
-cp roundcube.config.inc.php ../roundcube/templates/roundcube/config.inc.php
-rm ../roundcube/templates/roundcube/main.inc.php
-cp roundcube.password.config.inc.php ../roundcube/templates/roundcube/plugins/password/config.inc.php
-cp roundcube-install ../roundcube/
-cp alternc-roundcube.postinst ../debian/
-
-# alternc-ssl package : 
-cp ssl.conf ../ssl/
-cp alternc-ssl.install.php ../ssl/
diff --git a/jessie/roundcube-install b/jessie/roundcube-install
deleted file mode 100644
index 59a26119..00000000
--- a/jessie/roundcube-install
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/bash
-
-# ----------------------------------------------------------------------
-# AlternC - Web Hosting System
-# Copyright (C) 2000-2012 by the AlternC Development Team.
-# https://alternc.org/
-# ----------------------------------------------------------------------
-# LICENSE
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License (GPL)
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# To read the license please visit http://www.gnu.org/copyleft/gpl.html
-# ----------------------------------------------------------------------
-# Purpose of file: Install roundcube conf files.
-# ----------------------------------------------------------------------
-
-if [ "$1" = "templates" ]
-then
-    echo "Installing Roundcube Templates ..."
-#    cp -f /etc/alternc/templates/roundcube/avelsieve-config.php /etc/alternc/templates/roundcube/apache.conf /etc/roundcube/
-#    cp -f /etc/alternc/templates/javascript-common/javascript-common.conf /etc/javascript-common/
-
-    LOGIN="0000_roundcube"
-    PASSWORD="`perl -e 'print map{("a".."z","A".."Z",0..9)[int(rand(62))]}(1..10)'`"
-    DESKEY="`perl -e 'print map{("a".."z","A".."Z",0..9)[int(rand(62))]}(1..24)'`"
-
-    # Add new variables to the sed script ...
-    SED_SCRIPT="/tmp/alternc-roundcube.sedscript"
-    # cf alternc.install for more explanations on this horror : 
-    eval `sed -n -e "/=/{s/ *= *\"\?/='/;s/\"\?\$/'/;s/host/MYSQL_HOST/;s/user/MYSQL_USER/;s/password/MYSQL_PASS/;s/database/MYSQL_DATABASE/;p}" /etc/alternc/my.cnf`
-    . /etc/alternc/local.sh
-    # Configuration template location
-    TEMPLATE_DIR="/etc/alternc/templates"
-    CONFIG_FILES="etc/roundcube/config.inc.php etc/roundcube/plugins/password/config.inc.php"
-
-    cat > $SED_SCRIPT <<EOF
-s\\%%ALTERNC_LOC%%\\$ALTERNC_LOC\\;
-s\\%%dbhost%%\\$MYSQL_HOST\\;
-s\\%%dbname%%\\$MYSQL_DATABASE\\;
-s\\%%roundcube-login%%\\$LOGIN\\;
-s\\%%roundcube-password%%\\$PASSWORD\\;
-s\\%%deskey%%\\$DESKEY\\;
-EOF
-    for file in $CONFIG_FILES; do
-	TEMPLATE="$TEMPLATE_DIR/${file##etc/}"
-	echo -n " $file"
-	if [ -f "$TEMPLATE" ]; then
-            sed -f "$SED_SCRIPT" < $TEMPLATE > /$file
-	fi
-    done
-
-    rm -f $SED_SCRIPT
-
-    echo "    Done"
-
-    . /usr/lib/alternc/functions.sh
-
-    echo "giving write access to roundcube to the email password ..."
-    # now database host user and password are mysql root account values ;) 
-    mysql_query "GRANT UPDATE (password) ON ${database}.address TO '${LOGIN}'@'${MYSQL_CLIENT}' IDENTIFIED BY '${PASSWORD}';"
-    mysql_query "GRANT SELECT ON ${database}.address TO '${LOGIN}'@'${MYSQL_CLIENT}';"
-    mysql_query "GRANT SELECT ON ${database}.domaines TO '${LOGIN}'@'${MYSQL_CLIENT}';"
-    echo "    Done"
-   
-    echo "Setting roundcube domaintype"
-    mysql_query "INSERT IGNORE INTO domaines_type (name ,description ,target ,entry ,compatibility ,enable ,only_dns ,need_dns ,advanced )VALUES ('roundcube','Roundcube Webmail access', 'NONE', '%SUB% IN A @@PUBLIC_IP@@', 'txt', 'ALL', '0', '0', '0');"
-    echo "    Done"
-
-    echo "Migrating old webmail domaine type to roundcube one:"
-    # migration of the "webmail" hosts to "roundcube" hosts:
-    mysql_query "INSERT IGNORE INTO sub_domaines (compte, domaine, sub, valeur, type, web_action, web_result, enable) SELECT compte, domaine, sub, valeur,'roundcube', 'UPDATE',0, enable FROM sub_domaines WHERE type='WEBMAIL';"
-    mysql_query "UPDATE sub_domaines SET web_action='DELETE' WHERE type='WEBMAIL';"
-    echo "    Done"
-
-    echo "Deconfiguring javascript-common alias"
-    if [ -f /etc/apache2/conf.d/javascript-common.conf ]; then
-        	rm -f /etc/apache2/conf.d/javascript-common.conf
-    fi
-    if [ -f /etc/apache2/conf-available/javascript-common.conf ] ; then
-		a2disconf javascript-common.conf
-		service apache2 reload
-    fi
-    # just in case 
-    if [ -f /etc/javascript-common/javascript-common.conf ]; then
-        sed -i -e "s/^Alias \/javascript/# Do not uncomment, commented by AlternC to prevent a global alias\n#Alias \/javascript/" /etc/javascript-common/javascript-common.conf
-    fi
-    echo "    Done"
-    
-fi
-
diff --git a/jessie/roundcube.config.inc.php b/jessie/roundcube.config.inc.php
deleted file mode 100644
index 207eb01c..00000000
--- a/jessie/roundcube.config.inc.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-/*
-+-----------------------------------------------------------------------+
-| Local configuration for the Roundcube Webmail installation.           |
-|                                                                       |
-| This is a sample configuration file only containing the minimum       |
-| setup required for a functional installation. Copy more options       |
-| from defaults.inc.php to this file to override the defaults.          |
-|                                                                       |
-| This file is part of the Roundcube Webmail client                     |
-| Copyright (C) 2005-2013, The Roundcube Dev Team                       |
-|                                                                       |
-| Licensed under the GNU General Public License version 3 or            |
-| any later version with exceptions for skins & plugins.                |
-| See the README file for a full license statement.                     |
-+-----------------------------------------------------------------------+
-*/
-
-$config = array();
-
-/* Do not set db_dsnw here, use dpkg-reconfigure roundcube-core to configure database ! */
-include_once("/etc/roundcube/debian-db-roundcube.php");
-
-// The mail host chosen to perform the log-in.
-// Leave blank to show a textbox at login, give a list of hosts
-// to display a pulldown menu or set one host as string.
-// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls://
-// Supported replacement variables:
-// %n - hostname ($_SERVER['SERVER_NAME'])
-// %t - hostname without the first part
-// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
-// %s - domain name after the '@' from e-mail address provided at login screen
-// For example %n = mail.domain.tld, %t = domain.tld
-$config['default_host'] = 'localhost';
-
-// SMTP server host (for sending mails).
-// To use SSL/TLS connection, enter hostname with prefix ssl:// or tls://
-// If left blank, the PHP mail() function is used
-// Supported replacement variables:
-// %h - user's IMAP hostname
-// %n - hostname ($_SERVER['SERVER_NAME'])
-// %t - hostname without the first part
-// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
-// %z - IMAP domain (IMAP hostname without the first part)
-// For example %n = mail.domain.tld, %t = domain.tld
-$config['smtp_server'] = '';
-
-// SMTP port (default is 25; use 587 for STARTTLS or 465 for the
-// deprecated SSL over SMTP (aka SMTPS))
-$config['smtp_port'] = 25;
-
-// SMTP username (if required) if you use %u as the username Roundcube
-// will use the current username for login
-$config['smtp_user'] = '';
-
-// SMTP password (if required) if you use %p as the password Roundcube
-// will use the current user's password for login
-$config['smtp_pass'] = '';
-
-// provide an URL where a user can get support for this Roundcube installation
-// PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE!
-$config['support_url'] = '';
-
-// Name your service. This is displayed on the login screen and in the window title
-$config['product_name'] = 'Roundcube Webmail';
-
-// this key is used to encrypt the users imap password which is stored
-// in the session record (and the client cookie if remember password is enabled).
-// please provide a string of exactly 24 chars.
-// YOUR KEY MUST BE DIFFERENT THAN THE SAMPLE VALUE FOR SECURITY REASONS
-$config['des_key'] = 'PFMKPD0[UcU3tvt8zrODOIsQ';
-
-// List of active plugins (in plugins/ directory)
-$config['plugins'] = array(
-'archive',
-'zipdownload',
-'managesieve',
-'password'
-);
-
-// skin name: folder from skins/
-$config['skin'] = 'larry';
diff --git a/jessie/roundcube.password.config.inc.php b/jessie/roundcube.password.config.inc.php
deleted file mode 100644
index 6d49ef6e..00000000
--- a/jessie/roundcube.password.config.inc.php
+++ /dev/null
@@ -1,401 +0,0 @@
-<?php
-
-// Password Plugin options
-// -----------------------
-// A driver to use for password change. Default: "sql".
-// See README file for list of supported driver names.
-$config['password_driver'] = 'sql';
-
-// Determine whether current password is required to change password.
-// Default: false.
-$config['password_confirm_current'] = true;
-
-// Require the new password to be a certain length.
-// set to blank to allow passwords of any length
-$config['password_minimum_length'] = 8;
-
-// Require the new password to contain a letter and punctuation character
-// Change to false to remove this check.
-$config['password_require_nonalpha'] = true;
-
-// Enables logging of password changes into logs/password
-$config['password_log'] = true;
-
-// Comma-separated list of login exceptions for which password change
-// will be not available (no Password tab in Settings)
-$config['password_login_exceptions'] = null;
-
-// Array of hosts that support password changing. Default is NULL.
-// Listed hosts will feature a Password option in Settings; others will not.
-// Example:
-//$config['password_hosts'] = array('mail.example.com', 'mail2.example.org');
-$config['password_hosts'] = null;
-
-// Enables saving the new password even if it matches the old password. Useful
-// for upgrading the stored passwords after the encryption scheme has changed.
-$config['password_force_save'] = false;
-
-// Enables forcing new users to change their password at their first login.
-$config['password_force_new_user'] = false;
-
-
-// SQL Driver options
-// ------------------
-// PEAR database DSN for performing the query. By default
-// Roundcube DB settings are used.
-$config['password_db_dsn'] = 'mysql://%%roundcube-login%%:%%roundcube-password%%@%%dbhost%%/%%dbname%%';
-
-// The SQL query used to change the password.
-// The query can contain the following macros that will be expanded as follows:
-//      %p is replaced with the plaintext new password
-//      %c is replaced with the crypt version of the new password, MD5 if available
-//         otherwise DES. More hash function can be enabled using the password_crypt_hash 
-//         configuration parameter.
-//      %D is replaced with the dovecotpw-crypted version of the new password
-//      %o is replaced with the password before the change
-//      %n is replaced with the hashed version of the new password
-//      %q is replaced with the hashed password before the change
-//      %h is replaced with the imap host (from the session info)
-//      %u is replaced with the username (from the session info)
-//      %l is replaced with the local part of the username
-//         (in case the username is an email address)
-//      %d is replaced with the domain part of the username
-//         (in case the username is an email address)
-// Escaping of macros is handled by this module.
-// Default: "SELECT update_passwd(%c, %u)"
-$config['password_query'] = 'UPDATE address a LEFT JOIN domaines d ON d.id=a.domain_id SET a.password=%c WHERE d.domaine=%d AND address=%l';
-
-// By default the crypt() function which is used to create the '%c' 
-// parameter uses the md5 algorithm. To use different algorithms 
-// you can choose between: des, md5, blowfish, sha256, sha512.
-// Before using other hash functions than des or md5 please make sure
-// your operating system supports the other hash functions.
-$config['password_crypt_hash'] = 'md5';
-
-// By default domains in variables are using unicode.
-// Enable this option to use punycoded names
-$config['password_idn_ascii'] = false;
-
-// Path for dovecotpw (if not in $PATH)
-// $config['password_dovecotpw'] = '/usr/local/sbin/dovecotpw';
-
-// Dovecot method (dovecotpw -s 'method')
-$config['password_dovecotpw_method'] = 'CRAM-MD5';
-
-// Enables use of password with crypt method prefix in %D, e.g. {MD5}$1$LUiMYWqx$fEkg/ggr/L6Mb2X7be4i1/
-$config['password_dovecotpw_with_method'] = false;
-
-// Using a password hash for %n and %q variables.
-// Determine which hashing algorithm should be used to generate
-// the hashed new and current password for using them within the
-// SQL query. Requires PHP's 'hash' extension.
-$config['password_hash_algorithm'] = 'sha1';
-
-// You can also decide whether the hash should be provided
-// as hex string or in base64 encoded format.
-$config['password_hash_base64'] = false;
-
-// Iteration count parameter for Blowfish-based hashing algo.
-// It must be between 4 and 31. Default: 12.
-// Be aware, the higher the value, the longer it takes to generate the password hashes.
-$config['password_blowfish_cost'] = 12;
-
-
-// Poppassd Driver options
-// -----------------------
-// The host which changes the password
-$config['password_pop_host'] = 'localhost';
-
-// TCP port used for poppassd connections
-$config['password_pop_port'] = 106;
-
-
-// SASL Driver options
-// -------------------
-// Additional arguments for the saslpasswd2 call
-$config['password_saslpasswd_args'] = '';
-
-
-// LDAP and LDAP_SIMPLE Driver options
-// -----------------------------------
-// LDAP server name to connect to. 
-// You can provide one or several hosts in an array in which case the hosts are tried from left to right.
-// Exemple: array('ldap1.exemple.com', 'ldap2.exemple.com');
-// Default: 'localhost'
-$config['password_ldap_host'] = 'localhost';
-
-// LDAP server port to connect to
-// Default: '389'
-$config['password_ldap_port'] = '389';
-
-// TLS is started after connecting
-// Using TLS for password modification is recommanded.
-// Default: false
-$config['password_ldap_starttls'] = false;
-
-// LDAP version
-// Default: '3'
-$config['password_ldap_version'] = '3';
-
-// LDAP base name (root directory)
-// Exemple: 'dc=exemple,dc=com'
-$config['password_ldap_basedn'] = 'dc=exemple,dc=com';
-
-// LDAP connection method
-// There is two connection method for changing a user's LDAP password.
-// 'user': use user credential (recommanded, require password_confirm_current=true)
-// 'admin': use admin credential (this mode require password_ldap_adminDN and password_ldap_adminPW)
-// Default: 'user'
-$config['password_ldap_method'] = 'user';
-
-// LDAP Admin DN
-// Used only in admin connection mode
-// Default: null
-$config['password_ldap_adminDN'] = null;
-
-// LDAP Admin Password
-// Used only in admin connection mode
-// Default: null
-$config['password_ldap_adminPW'] = null;
-
-// LDAP user DN mask
-// The user's DN is mandatory and as we only have his login,
-// we need to re-create his DN using a mask
-// '%login' will be replaced by the current roundcube user's login
-// '%name' will be replaced by the current roundcube user's name part
-// '%domain' will be replaced by the current roundcube user's domain part
-// '%dc' will be replaced by domain name hierarchal string e.g. "dc=test,dc=domain,dc=com"
-// Exemple: 'uid=%login,ou=people,dc=exemple,dc=com'
-$config['password_ldap_userDN_mask'] = 'uid=%login,ou=people,dc=exemple,dc=com';
-
-// LDAP search DN
-// The DN roundcube should bind with to find out user's DN
-// based on his login. Note that you should comment out the default
-// password_ldap_userDN_mask setting for this to take effect.
-// Use this if you cannot specify a general template for user DN with
-// password_ldap_userDN_mask. You need to perform a search based on
-// users login to find his DN instead. A common reason might be that
-// your users are placed under different ou's like engineering or
-// sales which cannot be derived from their login only.
-$config['password_ldap_searchDN'] = 'cn=roundcube,ou=services,dc=example,dc=com';
-
-// LDAP search password
-// If password_ldap_searchDN is set, the password to use for
-// binding to search for user's DN. Note that you should comment out the default
-// password_ldap_userDN_mask setting for this to take effect.
-// Warning: Be sure to set approperiate permissions on this file so this password
-// is only accesible to roundcube and don't forget to restrict roundcube's access to
-// your directory as much as possible using ACLs. Should this password be compromised
-// you want to minimize the damage.
-$config['password_ldap_searchPW'] = 'secret';
-
-// LDAP search base
-// If password_ldap_searchDN is set, the base to search in using the filter below.
-// Note that you should comment out the default password_ldap_userDN_mask setting
-// for this to take effect.
-$config['password_ldap_search_base'] = 'ou=people,dc=example,dc=com';
-
-// LDAP search filter
-// If password_ldap_searchDN is set, the filter to use when
-// searching for user's DN. Note that you should comment out the default
-// password_ldap_userDN_mask setting for this to take effect.
-// '%login' will be replaced by the current roundcube user's login
-// '%name' will be replaced by the current roundcube user's name part
-// '%domain' will be replaced by the current roundcube user's domain part
-// '%dc' will be replaced by domain name hierarchal string e.g. "dc=test,dc=domain,dc=com"
-// Example: '(uid=%login)'
-// Example: '(&(objectClass=posixAccount)(uid=%login))'
-$config['password_ldap_search_filter'] = '(uid=%login)';
-
-// LDAP password hash type
-// Standard LDAP encryption type which must be one of: crypt,
-// ext_des, md5crypt, blowfish, md5, sha, smd5, ssha, ad, cram-md5 (dovecot style) or clear.
-// Please note that most encodage types require external libraries
-// to be included in your PHP installation, see function hashPassword in drivers/ldap.php for more info.
-// Multiple password Values can be generated by concatenating encodings with a +. E.g. 'cram-md5+crypt'
-// Default: 'crypt'.
-$config['password_ldap_encodage'] = 'crypt';
-
-// LDAP password attribute
-// Name of the ldap's attribute used for storing user password
-// Default: 'userPassword'
-$config['password_ldap_pwattr'] = 'userPassword';
-
-// LDAP password force replace
-// Force LDAP replace in cases where ACL allows only replace not read
-// See http://pear.php.net/package/Net_LDAP2/docs/latest/Net_LDAP2/Net_LDAP2_Entry.html#methodreplace
-// Default: true
-$config['password_ldap_force_replace'] = true;
-
-// LDAP Password Last Change Date
-// Some places use an attribute to store the date of the last password change
-// The date is meassured in "days since epoch" (an integer value)
-// Whenever the password is changed, the attribute will be updated if set (e.g. shadowLastChange)
-$config['password_ldap_lchattr'] = '';
-
-// LDAP Samba password attribute, e.g. sambaNTPassword
-// Name of the LDAP's Samba attribute used for storing user password
-$config['password_ldap_samba_pwattr'] = '';
- 
-// LDAP Samba Password Last Change Date attribute, e.g. sambaPwdLastSet
-// Some places use an attribute to store the date of the last password change
-// The date is meassured in "seconds since epoch" (an integer value)
-// Whenever the password is changed, the attribute will be updated if set
-$config['password_ldap_samba_lchattr'] = '';
-
-
-// DirectAdmin Driver options
-// --------------------------
-// The host which changes the password
-// Use 'ssl://host' instead of 'tcp://host' when running DirectAdmin over SSL.
-// The host can contain the following macros that will be expanded as follows:
-//     %h is replaced with the imap host (from the session info)
-//     %d is replaced with the domain part of the username (if the username is an email)
-$config['password_directadmin_host'] = 'tcp://localhost';
-
-// TCP port used for DirectAdmin connections
-$config['password_directadmin_port'] = 2222;
-
-
-// vpopmaild Driver options
-// -----------------------
-// The host which changes the password
-$config['password_vpopmaild_host'] = 'localhost';
-
-// TCP port used for vpopmaild connections
-$config['password_vpopmaild_port'] = 89;
-
-// Timout used for the connection to vpopmaild (in seconds)
-$config['password_vpopmaild_timeout'] = 10;
-
-
-// cPanel Driver options
-// --------------------------
-// The cPanel Host name
-$config['password_cpanel_host'] = 'host.domain.com';
-
-// The cPanel admin username
-$config['password_cpanel_username'] = 'username';
-
-// The cPanel admin password
-$config['password_cpanel_password'] = 'password';
-
-// The cPanel port to use
-$config['password_cpanel_port'] = 2087;
-
-
-// XIMSS (Communigate server) Driver options
-// -----------------------------------------
-// Host name of the Communigate server
-$config['password_ximss_host'] = 'mail.example.com';
-
-// XIMSS port on Communigate server
-$config['password_ximss_port'] = 11024;
-
-
-// chpasswd Driver options
-// ---------------------
-// Command to use
-$config['password_chpasswd_cmd'] = 'sudo /usr/sbin/chpasswd 2> /dev/null';
-
-
-// XMail Driver options
-// ---------------------
-$config['xmail_host'] = 'localhost';
-$config['xmail_user'] = 'YourXmailControlUser';
-$config['xmail_pass'] = 'YourXmailControlPass';
-$config['xmail_port'] = 6017;
-
-
-// hMail Driver options
-// -----------------------
-// Remote hMailServer configuration
-// true:  HMailserver is on a remote box (php.ini: com.allow_dcom = true)
-// false: Hmailserver is on same box as PHP
-$config['hmailserver_remote_dcom'] = false;
-// Windows credentials
-$config['hmailserver_server'] = array(
-    'Server' => 'localhost', // hostname or ip address
-    'Username' => 'administrator', // windows username
-    'Password' => 'password' // windows user password
-);
-
-
-// Virtualmin Driver options
-// -------------------------
-// Username format:
-// 0: username@domain
-// 1: username%domain
-// 2: username.domain
-// 3: domain.username
-// 4: username-domain
-// 5: domain-username
-// 6: username_domain
-// 7: domain_username
-$config['password_virtualmin_format'] = 0;
-
-
-// pw_usermod Driver options
-// --------------------------
-// Use comma delimited exlist to disable password change for users
-// Add the following line to visudo to tighten security:
-// www  ALL=NOPASSWORD: /usr/sbin/pw
-$config['password_pw_usermod_cmd'] = 'sudo /usr/sbin/pw usermod -h 0 -n';
-
-
-// DBMail Driver options
-// -------------------
-// Additional arguments for the dbmail-users call
-$config['password_dbmail_args'] = '-p sha512';
-
-
-// Expect Driver options
-// ---------------------
-// Location of expect binary
-$config['password_expect_bin'] = '/usr/bin/expect';
-
-// Location of expect script (see helpers/passwd-expect)
-$config['password_expect_script'] = '';
-
-// Arguments for the expect script. See the helpers/passwd-expect file for details.
-// This is probably a good starting default:
-//   -telent -host localhost -output /tmp/passwd.log -log /tmp/passwd.log
-$config['password_expect_params'] = '';
-
-
-// smb Driver options
-// ---------------------
-// Samba host (default: localhost)
-// Supported replacement variables:
-// %n - hostname ($_SERVER['SERVER_NAME'])
-// %t - hostname without the first part
-// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
-$config['password_smb_host'] = 'localhost';
-// Location of smbpasswd binary
-$config['password_smb_cmd'] = '/usr/bin/smbpasswd';
-
-// gearman driver options
-// ---------------------
-// Gearman host (default: localhost)
-$config['password_gearman_host'] = 'localhost';
-
-
-
-// Plesk/PPA Driver options
-// --------------------
-// You need to allow RCP for IP of roundcube-server in Plesk/PPA Panel 
-
-// Plesk RCP Host
-$config['password_plesk_host'] = '10.0.0.5';
-
-// Plesk RPC Username
-$config['password_plesk_user'] = 'admin';
-
-// Plesk RPC Password
-$config['password_plesk_pass'] = 'password';
-
-// Plesk RPC Port
-$config['password_plesk_rpc_port'] = '8443';
-
-// Plesk RPC Path
-$config['password_plesk_rpc_path'] = 'enterprise/control/agent.php';
diff --git a/jessie/ssl.conf b/jessie/ssl.conf
deleted file mode 100644
index 68b422b3..00000000
--- a/jessie/ssl.conf
+++ /dev/null
@@ -1,91 +0,0 @@
-# ############################################################################
-#           WARNING : this file is overwritten by alternc.install. 
-#        Edit /etc/alternc/templates/apache2/mods-available/ instead.
-# ############################################################################
-
-<IfModule mod_ssl.c>
-#
-# Pseudo Random Number Generator (PRNG):
-# Configure one or more sources to seed the PRNG of the SSL library.
-# The seed data should be of good random quality.
-# WARNING! On some platforms /dev/random blocks if not enough entropy
-# is available. This means you then cannot use the /dev/random device
-# because it would lead to very long connection times (as long as
-# it requires to make more entropy available). But usually those
-# platforms additionally provide a /dev/urandom device which doesn't
-# block. So, if available, use this one instead. Read the mod_ssl User
-# Manual for more details.
-#
-SSLRandomSeed startup builtin
-SSLRandomSeed startup file:/dev/urandom 512
-SSLRandomSeed connect builtin
-SSLRandomSeed connect file:/dev/urandom 512
-
-##
-##  SSL Global Context
-##
-##  All SSL configuration in this context applies both to
-##  the main server and all SSL-enabled virtual hosts.
-##
-
-#
-#   Some MIME-types for downloading Certificates and CRLs
-#
-AddType application/x-x509-ca-cert .crt
-AddType application/x-pkcs7-crl    .crl
-
-#   Pass Phrase Dialog:
-#   Configure the pass phrase gathering process.
-#   The filtering dialog program (`builtin' is a internal
-#   terminal dialog) has to provide the pass phrase on stdout.
-SSLPassPhraseDialog  builtin
-
-#   Inter-Process Session Cache:
-#   Configure the SSL Session Cache: First the mechanism 
-#   to use and second the expiring timeout (in seconds).
-#   (The mechanism dbm has known memory leaks and should not be used).
-#SSLSessionCache         dbm:${APACHE_RUN_DIR}/ssl_scache
-SSLSessionCache        shmcb:${APACHE_RUN_DIR}/ssl_scache(512000)
-SSLSessionCacheTimeout  300
-
-#   Semaphore:
-#   Configure the path to the mutual exclusion semaphore the
-#   SSL engine uses internally for inter-process synchronization. 
-Mutex  file:${APACHE_RUN_DIR}
-
-#   SSL Cipher Suite:
-#   List the ciphers that the client is permitted to negotiate. See the
-#   ciphers(1) man page from the openssl package for list of all available
-#   options.
-#   Enable only secure ciphers:
-#SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5
-SSLCipherSuite ALL:!aNULL:!eNULL:!LOW:!EXP:!RC4:!3DES:+HIGH:+MEDIUM
-# Other possible ciphersuite (requires wheezy-version of apache2 at least)
- #SSLCipherSuite "EECDH+ECDSA+AESGCM EECDH+aRSA+AESGCM EECDH+ECDSA+SHA384 EECDH+ECDSA+SHA256 EECDH+aRSA+SHA384 EECDH+aRSA+SHA256 EECDH+aRSA+RC4 EECDH EDH+aRSA !RC4 !aNULL !eNULL !LOW !3DES !MD5 !EXP !PSK !SRP !DSS"
-
-#   Speed-optimized SSL Cipher configuration:
-#   If speed is your main concern (on busy HTTPS servers e.g.),
-#   you might want to force clients to specific, performance
-#   optimized ciphers. In this case, prepend those ciphers
-#   to the SSLCipherSuite list, and enable SSLHonorCipherOrder.
-#   Caveat: by giving precedence to RC4-SHA and AES128-SHA
-#   (as in the example below), most connections will no longer
-#   have perfect forward secrecy - if the server's key is
-#   compromised, captures of past or future traffic must be
-#   considered compromised, too.
-#SSLCipherSuite RC4-SHA:AES128-SHA:HIGH:MEDIUM:!aNULL:!MD5
-SSLHonorCipherOrder on
-
-# enable only secure protocols: SSLv3 and TLSv1, but not SSLv2
-#SSLProtocol all -SSLv2
-SSLProtocol all -SSLv2 -SSLv3
-
-# Allow insecure renegotiation with clients which do not yet support the
-# secure renegotiation protocol. Default: Off
-#SSLInsecureRenegotiation on
-
-# Whether to forbid non-SNI clients to access name based virtual hosts.
-# Default: Off
-SSLStrictSNIVHostCheck Off
-
-</IfModule>
diff --git a/jessie/vhost.conf b/jessie/vhost.conf
deleted file mode 100644
index 8b4f304f..00000000
--- a/jessie/vhost.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-<VirtualHost *:80>
-  ServerName %%fqdn%%
-  DocumentRoot "%%document_root%%"
-  AssignUserId #%%UID%% #%%GID%%
-  SetEnv LOGIN "%%UID%%-%%LOGIN%%"
-
-  <Directory "%%document_root%%">
-    php_admin_value open_basedir "%%account_root%%:/usr/share/php/"
-    php_admin_value upload_tmp_dir %%account_root%%/tmp
-    php_admin_value sendmail_path '/usr/lib/alternc/sendmail "%%mail_account%%" '
-    php_admin_flag mail.add_x_header on
-    Options -MultiViews -FollowSymLinks +SymLinksIfOwnerMatch
-    AllowOverride AuthConfig FileInfo Limit Options Indexes
-    Order allow,deny
-    Allow from all
-    Require all granted
-  </Directory>
-
-# If you want to log the errors also in /var/log/alternc/sites/ 
-# WARNING: this WILL FORK a vlogger for EACH VHOST havingg this !!! the load on the machine may be high 
-# on hosting with many vhosts. as a consequence, this is disabled by default
-#  ErrorLog "|| /usr/sbin/vlogger -e -u alterncpanel -g alterncpanel -s error.log -t \"error-%Y%m%d.log\" /var/log/alternc/sites/%%UID%%-%%LOGIN%%/"
-
-</VirtualHost>
-
diff --git a/wheezy/95_alternc.conf b/wheezy/95_alternc.conf
deleted file mode 100644
index dda55336..00000000
--- a/wheezy/95_alternc.conf
+++ /dev/null
@@ -1,344 +0,0 @@
-# AUTO GENERATED FILE
-# Modify template in /etc/alternc/templates/
-# and launch alternc.install if you want 
-# to modify this file.
-#
-## Dovecot configuration file
-# This is a concatenation of all /etc/dovecot/conf.d/* from DEBIAN package
-# with rules adapted to AlternC best practices and link with MySQL tables.
-
-protocols = imap pop3 sieve
-
-default_process_limit = 1000
-
-## -------------------------------------------------------------------------
-## 10-auth
-
-# Disable LOGIN command and all other plaintext authentications unless
-# SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP
-# matches the local IP (ie. you're connecting from the same computer), the
-# connection is considered secure and plaintext authentication is allowed.
-disable_plaintext_auth = no
-
-# Space separated list of wanted authentication mechanisms:
-#   plain login digest-md5 cram-md5 ntlm rpa apop anonymous gssapi otp skey
-#   gss-spnego
-# NOTE: See also disable_plaintext_auth setting.
-auth_mechanisms = plain login
-
-##
-## Password and user databases
-##
-
-#
-# Password database is used to verify user's password (and nothing more).
-# You can have multiple passdbs and userdbs. This is useful if you want to
-# allow both system users (/etc/passwd) and virtual users to login without
-# duplicating the system users into virtual database.
-#
-# <doc/wiki/PasswordDatabase.txt>
-#
-# User database specifies where mails are located and what user/group IDs
-# own them. For single-UID configuration use "static" userdb.
-#
-# <doc/wiki/UserDatabase.txt>
-
-#!include auth-deny.conf.ext
-#!include auth-master.conf.ext
-
-#!include auth-system.conf.ext
-#!include auth-sql.conf.ext
-#!include auth-ldap.conf.ext
-#!include auth-passwdfile.conf.ext
-#!include auth-checkpassword.conf.ext
-#!include auth-vpopmail.conf.ext
-#!include auth-static.conf.ext
-
-
-# ----------------------------------------------------------------------------
-# 10-login.conf
-
-# Prefix for each line written to log file. % codes are in strftime(3)
-# format.
-#log_timestamp = "%b %d %H:%M:%S "
-log_timestamp = "%Y-%m-%d %H:%M:%S "
-
-# ----------------------------------------------------------------------------
-# 10-mail.conf
-
-
-# Location for users' mailboxes. This is the same as the old default_mail_env
-# setting. The default is empty, which means that Dovecot tries to find the
-# mailboxes automatically. This won't work if the user doesn't have any mail
-# yet, so you should explicitly tell Dovecot the full location.
-#
-# If you're using mbox, giving a path to the INBOX file (eg. /var/mail/%u)
-# isn't enough. You'll also need to tell Dovecot where the other mailboxes are
-# kept. This is called the "root mail directory", and it must be the first
-# path given in the mail_location setting.
-#
-# There are a few special variables you can use, eg.:
-#
-#   %u - username
-#   %n - user part in user@domain, same as %u if there's no domain
-#   %d - domain part in user@domain, empty if there's no domain
-#   %h - home directory
-#
-# See </usr/share/doc/dovecot-common/wiki/Variables.txt> for full list.
-# Some examples:
-#
-#   mail_location = maildir:~/Maildir
-#   mail_location = mbox:~/mail:INBOX=/var/mail/%u
-#   mail_location = mbox:/var/mail/%d/%1n/%n:INDEX=/var/indexes/%d/%1n/%n
-#
-# </usr/share/doc/dovecot-common/wiki/MailLocation.txt>
-#
-mail_location = maildir:~/Maildir
-
-
-# Group to enable temporarily for privileged operations. Currently this is
-# used only with INBOX when either its initial creation or dotlocking fails.
-# Typically this is set to "mail" to give access to /var/mail.
-#mail_privileged_group =
-mail_privileged_group = vmail
-
-
-# Valid UID range for users, defaults to 500 and above. This is mostly
-# to make sure that users can't log in as daemons or other system users.
-# Note that denying root logins is hardcoded to dovecot binary and can't
-# be done even if first_valid_uid is set to 0.
-first_valid_uid = 2000
-last_valid_uid = 65000
-
-# ----------------------------------------------------------------------------
-# 10-master.conf
-
-passdb {
-  driver = sql
-  args = /etc/dovecot/alternc-sql.conf
-}
-
-userdb {
-  driver = sql
-  args = /etc/dovecot/alternc-sql.conf
-}
-userdb {
-  driver = prefetch
-}
-
-service auth {
-  unix_listener /var/spool/postfix/private/auth {
-    group = postfix
-    mode = 0660
-    user = postfix
-  }
-  unix_listener auth-master {
-    mode = 0600
-    user = vmail
-  }
-
-  # set this to (default_client_limit * number of services using it) 
-  client_limit = 5000
-}
-
-service anvil {
-  # set this to (default_client_limit * number of services using it) 
-  client_limit = 5000
-}
-
-
-# ----------------------------------------------------------------------------
-# 10-ssl.conf
-
-# SSL/TLS support: yes, no, required. </usr/share/doc/dovecot-common/wiki/SSL.txt>
-ssl = yes
-
-# PEM encoded X.509 SSL/TLS certificate and private key. They're opened before
-# dropping root privileges, so keep the key file unreadable by anyone but
-# root.
-#ssl_cert = </etc/dovecot/dovecot.pem
-#ssl_cert_file = /etc/alternc/apache.pem
-#ssl_key = </etc/dovecot/dovecot.pem
-#ssl_key_file = /etc/alternc/apache.pem
-
-
-# ----------------------------------------------------------------------------
-# 15-lda.conf
-
-##
-## LDA specific settings
-##
-
-protocol lda {
-  # Address to use when sending rejection mails (e.g. postmaster@example.com).
-  postmaster_address = postmaster@localhost
-
-  # Hostname to use in various parts of sent mails, eg. in Message-Id.
-  # Default is the system's real hostname.
-  #hostname = 
-
-  # Support for dynamically loadable plugins. mail_plugins is a space separated
-  # list of plugins to load.
-  mail_plugins = quota sieve
-  #mail_plugin_dir = /usr/lib/dovecot/modules/lda
-
-
-  # UNIX socket path to master authentication server to find users.
-  auth_socket_path = /var/run/dovecot/auth-master
-}
-
-
-# ----------------------------------------------------------------------------
-# 20-imap.conf
-
-protocol imap {
-  # Support for dynamically loadable plugins. mail_plugins is a space separated
-  # list of plugins to load.
-  mail_plugins = quota imap_quota 
-  #mail_plugin_dir = /usr/lib/dovecot/modules/imap
-  mail_max_userip_connections = 500
-}
-
-service imap {
-  executable = imap imap-postlogin
-  vsz_limit = 512M
-}
-
-service imap-postlogin {
-	executable =   script-login /usr/lib/alternc/popimap-log-login.sh
-  # the script process runs as the user specified here (v2.0.14+):
-#  user = $default_internal_user
-  # this UNIX socket listener must use the same name as given to imap executable
-  unix_listener imap-postlogin {
-  }
-}
-
-# ----------------------------------------------------------------------------
-# 20-managesieve.conf
-
-protocol sieve {
-  managesieve_notify_capability = mailto
-  managesieve_sieve_capability = fileinto reject envelope encoded-character vacation subaddress comparator-i;ascii-numeric relational regex imap4flags copy include variables body enotify environment mailbox date ihave
-}
-
-service managesieve {
-  executable = /usr/lib/dovecot/managesieve
-}
-
-
-
-# ----------------------------------------------------------------------------
-# 20-pop3.conf
-
-protocol pop3 {
-
-  # POP3 UIDL (unique mail identifier) format to use. You can use following
-  # variables, along with the variable modifiers described in
-  # </usr/share/doc/dovecot-common/wiki/Variables.txt> (e.g. %Uf for the
-  # filename in uppercase)
-  #
-  #  %v - Mailbox's IMAP UIDVALIDITY
-  #  %u - Mail's IMAP UID
-  #  %m - MD5 sum of the mailbox headers in hex (mbox only)
-  #  %f - filename (maildir only)
-  #
-  # If you want UIDL compatibility with other POP3 servers, use:
-  #  UW's ipop3d         : %08Xv%08Xu
-  #  Courier             : %f or %v-%u (both might be used simultaneosly)
-  #  Cyrus (<= 2.1.3)    : %u
-  #  Cyrus (>= 2.1.4)    : %v.%u
-  #  Dovecot v0.99.x     : %v.%u
-  #  tpop3d              : %Mf
-  #
-  # Note that Outlook 2003 seems to have problems with %v.%u format which was
-  # Dovecot's default, so if you're building a new server it would be a good
-  # idea to change this. %08Xu%08Xv should be pretty fail-safe.
-  #
-  pop3_uidl_format = %08Xu%08Xv
-
-  # Support for dynamically loadable plugins. mail_plugins is a space separated
-  # list of plugins to load.
-  mail_plugins = quota
-  #mail_plugin_dir = /usr/lib/dovecot/modules/pop3
-
-}
-
-service pop3 {
-  executable = /usr/lib/alternc/popimap-log-login.sh /usr/lib/dovecot/pop3
-}
-
-# ----------------------------------------------------------------------------
-# 90-plugin.conf
-
-plugin {
-
-  # Quota plugin. Multiple backends are supported:
-  #   dirsize: Find and sum all the files found from mail directory.
-  #            Extremely SLOW with Maildir. It'll eat your CPU and disk I/O.
-  #   dict: Keep quota stored in dictionary (eg. SQL)
-  #   maildir: Maildir++ quota
-  #   fs: Read-only support for filesystem quota
-  #
-  # Quota limits are set using "quota_rule" parameters, either in here or in
-  # userdb. It's also possible to give mailbox-specific limits, for example:
-  #   quota_rule = *:storage=1048576
-     quota_rule = *:storage=100M
-     quota_rule2 = Trash:storage=+10%%
-  #   quota_rule2 = Trash:storage=102400
-  # User has now 1GB quota, but when saving to Trash mailbox the user gets
-  # additional 100MB.
-  #
-  # Multiple quota roots are also possible, for example:
-  #   quota = dict:user::proxy::quota
-  #   quota2 = dict:domain:%d:proxy::quota_domain
-  #   quota_rule = *:storage=102400
-  #   quota2_rule = *:storage=1048576
-  # Gives each user their own 100MB quota and one shared 1GB quota within
-  # the domain.
-  #
-  # You can execute a given command when user exceeds a specified quota limit.
-  # Each quota root has separate limits. Only the command for the first
-  # exceeded limit is excecuted, so put the highest limit first.
-  # Note that % needs to be escaped as %%, otherwise "% " expands to empty.
-  #   quota_warning = storage=95%% /usr/local/bin/quota-warning.sh 95
-  #   quota_warning2 = storage=80%% /usr/local/bin/quota-warning.sh 80
-     quota_warning = storage=95%% /usr/lib/alternc/quota-warning.sh 95
-     quota_warning2 = storage=80%% /usr/lib/alternc/quota-warning.sh 80
-  #quota = maildir
-  quota = dict:user::proxy::quotadict
-
-
-  # Sieve plugin (http://wiki.dovecot.org/LDA/Sieve) and ManageSieve service
-  #
-  # Location of the active script. When ManageSieve is used this is actually
-  # a symlink pointing to the active script in the sieve storage directory.
-  sieve=~/.dovecot.sieve
-  #
-  # The path to the directory where the personal Sieve scripts are stored. For
-  # ManageSieve this is where the uploaded scripts are stored.
-  sieve_dir=~/sieve
-}
-
-# Dictionary can be used by some plugins to store key=value lists, such as
-# quota, expire and acl plugins. The dictionary can be used either directly or
-# though a dictionary server. The following dict block maps dictionary names to
-# URIs when the server is used. These can then be referenced using URIs in
-# format "proxy::<name>".
-
-dict {
-  quotadict = mysql:/etc/dovecot/alternc-dict-quota.conf
-  #expire = db:/var/lib/dovecot/expire.db
-}
-
-
-service auth-worker {
-  user = vmail
-}
-
-service dict {
-  unix_listener dict {
-    mode = 0660
-    user = vmail
-    group = vmail
-  }
-}
diff --git a/wheezy/alternc-dict-quota.conf b/wheezy/alternc-dict-quota.conf
deleted file mode 100644
index 8ad06548..00000000
--- a/wheezy/alternc-dict-quota.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-# AUTO GENERATED FILE
-# Modify template in /etc/alternc/templates/
-# and launch alternc.install if you want 
-# to modify this file.
-#
-
-connect=host=%%dbhost%% dbname=%%dbname%% user=%%db_mail_user%% password=%%db_mail_pwd%%
-#connect = host=localhost dbname=mails user=testuser password=pass
-
-# CREATE TABLE quota (
-#   username varchar(100) not null,
-#   bytes bigint not null default 0,
-#   messages integer not null default 0,
-#   primary key (username)
-# );
-
-map {
-  pattern = priv/quota/storage
-  table = dovecot_quota
-  username_field = user
-  value_field = quota_dovecot 
-}
-map {
- pattern = priv/quota/messages
- table = dovecot_quota
- username_field = user
- value_field = nb_messages
-}
-
-# CREATE TABLE expires (
-#   username varchar(100) not null,
-#   mailbox varchar(255) not null,
-#   expire_stamp integer not null,
-#   primary key (username, mailbox)
-# );
-
-#map {
- # pattern = shared/expire/$user/$mailbox
- # table = expires
- # value_field = expire_stamp
-
- # fields {
- #   username = $user
- #   mailbox = $mailbox
- # }
-#}
-
diff --git a/wheezy/alternc-sql.conf b/wheezy/alternc-sql.conf
deleted file mode 100644
index e4bad783..00000000
--- a/wheezy/alternc-sql.conf
+++ /dev/null
@@ -1,137 +0,0 @@
-# AUTO GENERATED FILE
-# Modify template in /etc/alternc/templates/
-# and launch alternc.install if you want 
-# to modify this file.
-# 
-# This file is opened as root, so it should be owned by root and mode 0600.
-#
-# http://wiki2.dovecot.org/AuthDatabase/SQL
-#
-# For the sql passdb module, you'll need a database with a table that
-# contains fields for at least the username and password. If you want to
-# use the user@domain syntax, you might want to have a separate domain
-# field as well.
-#
-# If your users all have the same uig/gid, and have predictable home
-# directories, you can use the static userdb module to generate the home
-# dir based on the username and domain. In this case, you won't need fields
-# for home, uid, or gid in the database.
-#
-# If you prefer to use the sql userdb module, you'll want to add fields
-# for home, uid, and gid. Here is an example table:
-#
-# CREATE TABLE users (
-#     username VARCHAR(128) NOT NULL,
-#     domain VARCHAR(128) NOT NULL,
-#     password VARCHAR(64) NOT NULL,
-#     home VARCHAR(255) NOT NULL,
-#     uid INTEGER NOT NULL,
-#     gid INTEGER NOT NULL,
-#     active CHAR(1) DEFAULT 'Y' NOT NULL
-# );
-
-# Database driver: mysql, pgsql, sqlite
-driver = mysql
-
-# Database connection string. This is driver-specific setting.
-#
-# HA / round-robin load-balancing is supported by giving multiple host
-# settings, like: host=sql1.host.org host=sql2.host.org
-#
-# pgsql:
-#   For available options, see the PostgreSQL documention for the
-#   PQconnectdb function of libpq.
-#   Use maxconns=n (default 5) to change how many connections Dovecot can
-#   create to pgsql.
-#
-# mysql:
-#   Basic options emulate PostgreSQL option names:
-#     host, port, user, password, dbname
-#
-#   But also adds some new settings:
-#     client_flags        - See MySQL manual
-#     ssl_ca, ssl_ca_path - Set either one or both to enable SSL
-#     ssl_cert, ssl_key   - For sending client-side certificates to server
-#     ssl_cipher          - Set minimum allowed cipher security (default: HIGH)
-#     option_file         - Read options from the given file instead of
-#                           the default my.cnf location
-#     option_group        - Read options from the given group (default: client)
-# 
-#   You can connect to UNIX sockets by using host: host=/var/run/mysql.sock
-#   Note that currently you can't use spaces in parameters.
-#
-# sqlite:
-#   The path to the database file.
-#
-# Examples:
-#   connect = host=192.168.1.1 dbname=users
-#   connect = host=sql.example.com dbname=virtual user=virtual password=blarg
-#   connect = /etc/dovecot/authdb.sqlite
-#
-connect = host=%%dbhost%% dbname=%%dbname%% user=%%db_mail_user%% password=%%db_mail_pwd%%
-
-# Default password scheme.
-#
-# List of supported schemes is in
-# http://wiki2.dovecot.org/Authentication/PasswordSchemes
-#
-default_pass_scheme = MD5
-
-# passdb query to retrieve the password. It can return fields:
-#   password - The user's password. This field must be returned.
-#   user - user@domain from the database. Needed with case-insensitive lookups.
-#   username and domain - An alternative way to represent the "user" field.
-#
-# The "user" field is often necessary with case-insensitive lookups to avoid
-# e.g. "name" and "nAme" logins creating two different mail directories. If
-# your user and domain names are in separate fields, you can return "username"
-# and "domain" fields instead of "user".
-#
-# The query can also return other fields which have a special meaning, see
-# http://wiki2.dovecot.org/PasswordDatabase/ExtraFields
-#
-# Commonly used available substitutions (see http://wiki2.dovecot.org/Variables
-# for full list):
-#   %u = entire user@domain
-#   %n = user part of user@domain
-#   %d = domain part of user@domain
-# 
-# Note that these can be used only as input to SQL query. If the query outputs
-# any of these substitutions, they're not touched. Otherwise it would be
-# difficult to have eg. usernames containing '%' characters.
-#
-# Example:
-#   password_query = SELECT userid AS user, pw AS password \
-#     FROM users WHERE userid = '%u' AND active = 'Y'
-#
-#password_query = \
-#  SELECT username, domain, password \
-#  FROM users WHERE username = '%n' AND domain = '%d'
-
-# userdb query to retrieve the user information. It can return fields:
-#   uid - System UID (overrides mail_uid setting)
-#   gid - System GID (overrides mail_gid setting)
-#   home - Home directory
-#   mail - Mail location (overrides mail_location setting)
-#
-# None of these are strictly required. If you use a single UID and GID, and
-# home or mail directory fits to a template string, you could use userdb static
-# instead. For a list of all fields that can be returned, see
-# http://wiki2.dovecot.org/UserDatabase/ExtraFields
-#
-# Examples:
-#   user_query = SELECT home, uid, gid FROM users WHERE userid = '%u'
-#   user_query = SELECT dir AS home, user AS uid, group AS gid FROM users where userid = '%u'
-#   user_query = SELECT home, 501 AS uid, 501 AS gid FROM users WHERE userid = '%u'
-# 
-user_query = SELECT userdb_home AS home, userdb_uid AS uid, 1998 AS gid, userdb_quota_rule AS quota_rule FROM dovecot_view WHERE user = '%u';
-
-# If you wish to avoid two SQL lookups (passdb + userdb), you can use
-# userdb prefetch instead of userdb sql in dovecot.conf. In that case you'll
-# also have to return userdb fields in password_query prefixed with "userdb_"
-# string. For example:
-# 
-password_query = SELECT user, password, userdb_home, userdb_uid, 1998 AS userdb_gid,userdb_quota_rule FROM dovecot_view where user= '%u'; 
-
-# Query to get a list of all usernames.
-#iterate_query = SELECT username AS user FROM users
diff --git a/wheezy/alternc.install.diff b/wheezy/alternc.install.diff
deleted file mode 100644
index e8aaae24..00000000
--- a/wheezy/alternc.install.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/install/alternc.install b/install/alternc.install
-index b9691b0..2ee07b8 100644
---- alternc.install.squeeze
-+++ alternc.install
-@@ -79,7 +79,7 @@ if [ -e /etc/default/saslauthd ]; then
- fi
- 
- if [ -e /etc/dovecot/dovecot.conf ]; then
--    CONFIG_FILES="$CONFIG_FILES etc/dovecot/dovecot.conf etc/dovecot/dovecot-sql.conf etc/dovecot/dovecot-dict-quota.conf"
-+    CONFIG_FILES="$CONFIG_FILES etc/dovecot/alternc-sql.conf etc/dovecot/alternc-dict-quota.conf etc/dovecot/conf.d/95_alternc.conf"
- fi
- 
- INSTALLED_CONFIG_TAR="/var/lib/alternc/backups/etc-installed.tar.gz"
-@@ -317,7 +317,7 @@ if [ -x /usr/sbin/apache2 ]; then
-         fi
- 
- 	# We enable dovecot SSL certificate instructions: (on wheezy we should use a new file in /etc/dovecot/conf.d/ )
--	sed -i -e 's#^ssl_cert_file.*$#ssl_cert_file = /etc/ssl/certs/ssl-cert-snakeoil.pem#' -e 's#^ssl_key_file.*$#ssl_key_file = /etc/ssl/private/ssl-cert-snakeoil.key#' /etc/dovecot/dovecot.conf
-+	( echo "# Don't change this file, it will be overwriten by alternc.install. Change ssl parameters in a file named 99_ssl.conf instead" ; echo "ssl_cert = </etc/alternc/apache.pem" ; echo "ssl_key = </etc/alternc/apache.pem" ) >/etc/dovecot/conf.d/96_ssl.conf
- 
-     else
-         # We disable proftpd tls module
-@@ -326,7 +326,7 @@ if [ -x /usr/sbin/apache2 ]; then
-         cp /etc/proftpd/modules.conf /etc/alternc/templates/proftpd/
- 
- 	# We disable dovecot SSL certificate instructions: (on wheezy we should remove a file in /etc/dovecot/conf.d/ )
--        sed -i -e 's#^ssl_cert_file.*$#ssl_cert_file = /etc/ssl/certs/ssl-cert-snakeoil.pem#' -e 's#^ssl_key_file.*$#ssl_key_file = /etc/ssl/private/ssl-cert-snakeoil.key#' /etc/dovecot/dovecot.conf
-+	( echo "# Don't change this file, it will be overwriten by alternc.install. Change ssl parameters in a file named 99_ssl.conf instead" ; echo "ssl_cert = </etc/ssl/certs/ssl-cert-snakeoil.pem" ; echo "ssl_key = </etc/ssl/private/ssl-cert-snakeoil.key" ) >/etc/dovecot/conf.d/96_ssl.conf
- 
-         echo "SSL not configured"
-         echo "create a certificate in /etc/alternc/apache.pem and rerun alternc.install"
-@@ -574,9 +574,11 @@ if [ "$HAS_ROOT" != "1" ]; then
-     fi
- fi
- 
--#giving vmail user read access on dovecot sql file
--chgrp vmail /etc/dovecot/dovecot.conf
--chmod g+r /etc/dovecot/dovecot.conf
-+# giving vmail user read access on dovecot sql file
-+chgrp vmail /etc/dovecot/alternc-sql.conf
-+chmod g+r /etc/dovecot/alternc-sql.conf
-+# Override some dovecot 2.0 configuration that may have happened during dovecot postinst:
-+sed -i -e 's/^ *!include/#!include/' /etc/dovecot/conf.d/10-auth.conf
- 
- # We force the re-computing of the DNS zones, since we may have changed the IP address (see #460)
- /usr/bin/mysql --defaults-file="/etc/alternc/my.cnf" -B -e "update domaines set dns_action='UPDATE' WHERE gesdns=1;"
diff --git a/wheezy/changelog.diff b/wheezy/changelog.diff
deleted file mode 100644
index 47156ff7..00000000
--- a/wheezy/changelog.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- changelog	2014-06-24 13:42:50.234304438 +0200
-+++ changelog.wheezy	2014-06-24 13:43:51.978313552 +0200
-@@ -1,3 +1,10 @@
-+alternc (3.2.10) oldstable; urgency=low
-+
-+  * Version identical to 3.1 for Squeeze
-+  * Includes a small dovecot patch / dependency for dovecot 2.0 for Wheezy
-+
-+ -- Benjamin Sonntag <benjamin@sonntag.fr>  Fri, 15 Jan 2016 15:26:00 +0100
-+
- alternc (3.1.11) oldoldstable; urgency=low
- 
-   * fix This is a big security upgrade of AlternC 3.x
diff --git a/wheezy/control.diff b/wheezy/control.diff
deleted file mode 100644
index 3e6d38b0..00000000
--- a/wheezy/control.diff
+++ /dev/null
@@ -1,49 +0,0 @@
---- control.squeeze	2017-10-06 12:01:52.272243664 +0200
-+++ control	2017-10-06 12:03:02.016307914 +0200
-@@ -38,16 +38,19 @@
-        , sudo
-        , adduser
-        , dnsutils
--       , dovecot-common (>=1:1.2.15)
--       , dovecot-common(<< 1:2.0)
--       , dovecot-imapd (>= 1:1.2.15)
--       , dovecot-pop3d (>= 1:1.2.15)
-+       , dovecot-common (>=1:2.1.7)
-+       , dovecot-imapd
-+       , dovecot-pop3d
-+       , dovecot-mysql
-        , vlogger
-        , mailutils | mailx
-        , zip
-        , incron
-        , cron
-        , opendkim
-+       , opendkim-tools
-+       , dovecot-sieve
-+       , dovecot-managesieved
-        , mysql-client(>= 5.0) | mariadb-client
-        , php5-curl
-        , quota
-@@ -123,15 +126,18 @@
-          , gettext (>= 0.10.40-5)
-          , adduser
-          , sudo
--         , dovecot-common (>=1:1.2.15)
--         , dovecot-common(<< 1:2.0)
--         , dovecot-imapd (>= 1:1.2.15)
--         , dovecot-pop3d (>= 1:1.2.15)
-+         , dovecot-common (>=1:2.1.7)
-+         , dovecot-imapd
-+         , dovecot-pop3d
-+         , dovecot-mysql
-          , vlogger
-          , mailutils | mailx
-          , incron
-          , cron
-          , opendkim
-+         , opendkim-tools
-+         , dovecot-sieve
-+         , dovecot-managesieved
-          , mysql-client(>= 5.0) | mariadb-client
-          , php5-curl
-          , ${misc:Depends}
diff --git a/wheezy/patch.sh b/wheezy/patch.sh
deleted file mode 100755
index 83bc8628..00000000
--- a/wheezy/patch.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-# Migrate a repository to WHEEZY
-
-# DON'T COMMIT ANYTHING AFTER launching this
-# reset your subversion repos back to the serverside one!
-
-cd `dirname $0` 
-
-pushd ../debian 
-patch <../wheezy/control.diff
-patch <../wheezy/changelog.diff
-popd
-pushd ../install
-patch <../wheezy/alternc.install.diff
-popd
-
-cp -vf alternc-dict-quota.conf  alternc-sql.conf ../etc/alternc/templates/dovecot/
-mkdir -p ../etc/alternc/templates/dovecot/conf.d/
-cp -vf 95_alternc.conf ../etc/alternc/templates/dovecot/conf.d/
-
-pushd ../etc/alternc/templates/dovecot
-rm -vf dovecot.conf  dovecot-dict-quota.conf dovecot-sql.conf
-popd
-
-
-

From 976296c833b06594e1cd29397bf53556a88c4903 Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@sonntag.fr>
Date: Thu, 21 Jun 2018 18:17:29 +0200
Subject: [PATCH 24/30] removing temporary diffs from squeeze

---
 debian/control.orig          | 323 -----------------
 install/alternc.install.orig | 647 -----------------------------------
 2 files changed, 970 deletions(-)
 delete mode 100644 debian/control.orig
 delete mode 100644 install/alternc.install.orig

diff --git a/debian/control.orig b/debian/control.orig
deleted file mode 100644
index 394506f9..00000000
--- a/debian/control.orig
+++ /dev/null
@@ -1,323 +0,0 @@
-Source: alternc
-Section: admin
-Priority: optional
-Maintainer: Benjamin Sonntag <benjamin@alternc.org>
-Build-Depends-Indep: perl
-                   , findutils (>= 4.1.7)
-                   , gettext (>= 0.10.40-5)
-Build-Depends: debhelper (>= 8)
-             , po-debconf
-Standards-Version: 3.9.4
-
-Package: alternc
-Architecture: all
-Pre-depends: debconf (>= 0.5.00) | debconf-2.0
-           , bash (>= 4)
-           , acl
-Depends: debianutils (>= 1.13.1)
-       , apache2-mpm-itk | libapache2-mpm-itk
-       , libapache2-mod-php5 | libapache2-mod-php7.0
-       , php5-mysql | php7.0-mysql
-       , phpmyadmin
-       , postfix
-       , proftpd-mod-mysql
-       , proftpd-basic
-       , bind9
-       , wget
-       , rsync
-       , ca-certificates
-       , locales
-       , perl-suid | perl
-       , postfix-mysql
-       , wwwconfig-common
-       , sasl2-bin
-       , libsasl2-modules
-       , php5-cli | php7.0-cli
-       , lockfile-progs (>= 0.1.9)
-       , gettext (>= 0.10.40-5)
-       , sudo
-       , adduser
-       , dnsutils
-       , dovecot-common (>=1:1.2.15)
-       , dovecot-common(<< 1:2.0)
-       , dovecot-imapd (>= 1:1.2.15)
-       , dovecot-pop3d (>= 1:1.2.15)
-       , vlogger
-       , mailutils | mailx
-       , zip
-       , incron
-       , cron
-       , opendkim
-       , mysql-client(>= 5.0) | mariadb-client
-       , php5-curl | php7.0-curl
-       , quota
-       , pwgen
-       , ${misc:Depends}
-Recommends: mysql-server(>= 5.0) | mariadb-server
-          , ntp
-          , unzip
-          , bzip2
-Conflicts: alternc-admintools
-        , alternc-awstats (<< 1.0)
-        , alternc-webalizer (<= 0.9.4)
-        , alternc-mailman (<< 2.0)
-        , courier-authlib
-Provides: alternc-admintools
-Replaces: alternc-admintools
-Suggests: alternc-awstats
-       , alternc-mailman
-       , alternc-changepass
-       , amavisd-new
-       , clamav-daemon
-       , spamassassin
-       , pop-before-smtp
-       , magpierss
-       , ncompress
-       , alternc-squirrelmail
-       , alternc-roundcube
-Description: Hosting software managment suite for Debian
- AlternC is a mutualized hosting software manager for Linux.
- It allows you to manage your websites, domains, ftp, emails, aliases,
- web statistics, mailing-lists, jabber accounts, etc.
- .
- AlternC is mainly a PHP based administration interface and some conf files
- for the software used by it. 
- .
- More information at http://www.alternc.com/
-Homepage: http://www.alternc.com/
-Description-fr.UTF-8: Suite logicielle d'hébergement mutualisé pour Debian
- AlternC est un logiciel d'hébergement mutualisé pour serveur Linux.
- Il permet de gérer les sites web, domaines, ftp, emails, alias,
- statistiques web, listes de discussions, comptes jabber, etc.
- .
- AlternC est essentiellement une interface d'administration en PHP et
- quelques fichiers de configuration pour les logiciels qu'il utilise.
- .
- Pour plus d'informations, consultez http://www.alternc.com/
-
-Package: alternc-slave
-Architecture: all
-Pre-depends: debconf (>= 0.5.00) | debconf-2.0, acl
-Depends: debianutils (>= 1.13.1)
-         , apache2-mpm-itk | libapache2-mpm-itk
-         , libapache2-mod-php5 | libapache2-mod-php7.0
-         , php5-mysql | php7.0-mysql
-         , phpmyadmin
-         , postfix
-         , proftpd-mod-mysql
-         , proftpd-basic
-         , postfix-tls
-         , bind9
-         , wget
-         , rsync
-         , ca-certificates
-         , locales
-         , perl-suid
-         , perl
-         , postfix-mysql
-         , wwwconfig-common
-         , sasl2-bin
-         , libsasl2-modules
-         , php5-cli | php7.0-cli
-         , lockfile-progs (>= 0.1.9)
-         , gettext (>= 0.10.40-5)
-         , adduser
-         , sudo
-         , dovecot-common (>=1:1.2.15)
-         , dovecot-common(<< 1:2.0)
-         , dovecot-imapd (>= 1:1.2.15)
-         , dovecot-pop3d (>= 1:1.2.15)
-         , vlogger
-         , mailutils | mailx
-         , incron
-         , cron
-         , opendkim
-         , mysql-client(>= 5.0) | mariadb-client
-         , php5-curl
-         , ${misc:Depends}
-Recommends:
-         quota
-Conflicts: alternc-admintools
-         , alternc-awstats (<= 0.3.2)
-         , alternc-webalizer (<= 0.9.4)
-         , alternc
-Provides: alternc
-Replaces: alternc
-Suggests: alternc-awstats
-         , alternc-mailman
-         , alternc-changepass
-         , amavisd-new
-         , clamav-daemon
-         , spamassassin
-         , pop-before-smtp
-         , magpierss
-         , zip
-         , ncompress
-         , bzip2
-Description: Hosting software managment suite for Debian
- AlternC is a mutualized hosting software manager for Linux.
- It allows you to manage your websites, domains, ftp, emails, aliases,
- web statistics, mailing-lists, jabber accounts, etc.
- .
- AlternC is mainly a PHP based administration interface and some conf files
- for the software used by it. 
- .
- This package is designed for frontend nodes in a load balancing setup, where
- the AlternC directory is not touched and managed over NFS.
- . 
- More information at http://www.alternc.com/
-Homepage: http://www.alternc.com/
-Description-fr.UTF-8: Suite logicielle d'hébergement mutualisé pour Debian
- AlternC est un logiciel d'hébergement mutualisé pour serveur Linux.
- Il permet de gérer les sites web, domaines, ftp, emails, alias,
- statistiques web, listes de discussions, comptes jabber, etc.
- .
- AlternC est essentiellement une interface d'administration en PHP et
- quelques fichiers de configuration pour les logiciels qu'il utilise.
- .
- Ce paquet permet de construire un noeud frontal dans une configuration avec
- répartiteur de charge, ou le dossier /var/alternc n'est pas modifié et géré
- à travers NFS.
- .
- Pour plus d'informations, consultez http://www.alternc.com/
-
-Package: alternc-squirrelmail
-Architecture: all
-Pre-depends: debconf (>= 0.5.00) | debconf-2.0
-Depends: debianutils (>= 1.13.1)
-       , alternc (>= 3.0~rc1)
-       , squirrelmail
-       , squirrelmail-locales
-       , avelsieve
-       , ${misc:Depends}
-Conflicts: alternc (<= 1.0.3)
-       , alternc-changepass
-Provides: alternc-webmail
-Suggests: 
-Description: Squirrelmail-Webmail plugin and configuration for AlternC
- AlternC is a mutualized hosting software manager for Linux.
- It allows you to manage your websites, domains, ftp, emails, aliases,
- web statistics, mailing-lists, jabber accounts, etc.
- .
- This extension to AlternC is installing and configuring properly the
- Squirrelmail Webmail. It also configure Avelsieve to allow server-side
- filtering, the password changing through MySQL, and the automatic
- creation of proper profile with the right address and language.
- .
- More information at http://www.alternc.com/
-Homepage: http://www.alternc.com/
-Description-fr.UTF-8: Webmail Squirrelmail pour AlternC
- AlternC est un logiciel d'hébergement mutualisé pour serveur Linux.
- Il permet de gérer les sites web, domaines, ftp, emails, alias,
- statistiques web, listes de discussions, comptes jabber, etc.
- .
- Cette extension d'AlternC installe et configure le webmail Squirrelmail.
- Il configure aussi Avelsieve pour permettre l'accès au filtrage du courrier
- côté serveur, ainsi que le changement de mot de passe via MySQL et la création
- automatique des profiles avec la bonne adresse et la bonne langue.
- .
- Pour plus d'informations, consultez http://www.alternc.com/
-
-Package: alternc-roundcube
-Architecture: all
-Pre-depends: debconf (>= 0.5.00) | debconf-2.0
-Depends: debianutils (>= 1.13.1)
-       , alternc (>= 3.0~rc1)
-       , roundcube (>= 0.7.1)
-       , roundcube-mysql (>= 0.7.1)
-       , roundcube-plugins (>= 0.7.1)
-       , imagemagick
-       , ${misc:Depends}
-Conflicts: alternc (<< 1.1)
-Provides: alternc-webmail
-Suggests: 
-Description: Roundcube-Webmail plugin and configuration for AlternC
- AlternC is a mutualized hosting software manager for Linux.
- It allows you to manage your websites, domains, ftp, emails, aliases,
- web statistics, mailing-lists, jabber accounts, etc.
- .
- This extension to AlternC is installing and configuring properly the
- Roundcube Webmail. It also configure sieve to allow server-side
- filtering, the password changing through MySQL, and the automatic
- creation of proper profile with the right address and language.
- .
- More information at http://www.alternc.com/
-Homepage: http://www.alternc.com/
-Description-fr.UTF-8: Webmail Roundcube pour AlternC
- AlternC est un logiciel d'hébergement mutualisé pour serveur Linux.
- Il permet de gérer les sites web, domaines, ftp, emails, alias,
- statistiques web, listes de discussions, comptes jabber, etc.
- .
- Cette extension d'AlternC installe et configure le webmail Roundcube.
- Il configure aussi sieve pour permettre l'accès au filtrage du courrier
- côté serveur, ainsi que le changement de mot de passe via MySQL et la création
- automatique des profiles avec la bonne adresse et la bonne langue.
- .
- Pour plus d'informations, consultez http://www.alternc.com/
-
-Package: alternc-awstats
-Priority: optional
-Section: admin
-Architecture: all
-Pre-depends: debconf
-Depends: alternc (>= 3.0~rc1)
-       , awstats (>=6.1-1)
-       , php5-cli | php7.0-cli
-       , ${misc:Depends}
-Suggests: apachemerge
-Description: Awstats statistics module for AlternC
- AlternC is a mutualized hosting software manager for Linux.
- It allows you to manage your websites,   domains, ftp, emails, aliases,
- web statistics, mailing-lists, jabber accounts, etc.
- .
- This package is an optional module that adds awstats statistics
- to the virtual desktop.
- .
- More information on http://www.alternc.com/.
-
-Package: alternc-api
-Architecture: all
-Pre-depends: debconf (>= 0.5.00) | debconf-2.0
-Depends: debianutils (>= 1.13.1)
-       , alternc (>= 3.0)
-       , ${misc:Depends}
-Conflicts: alternc (<< 3.0)
-Description: Rest or get/post API for AlternC
- AlternC is a mutualized hosting software manager for Linux.
- It allows you to manage your websites, domains, ftp, emails, aliases,
- web statistics, mailing-lists, jabber accounts, etc.
- .
- This extension to AlternC is installing and configuring properly the
- GET/POST/REST API. You can then use https://yourpanel/api/ as an endpoint
- to launch remotely any functions of the hosting control panel.
- .
- More information at http://www.alternc.com/
-Homepage: http://www.alternc.com/
-
-Package: alternc-ssl
-Priority: optional
-Section: admin
-Architecture: all
-Depends: openssl
-    , mysql-client | mariadb-client
-    , debconf
-    , alternc (>= 3.0)
-    , php5-cli | php7.0-cli
-    , ${misc:Depends}
-Conflicts: alternc (<< 3.0)
-Description: HTTPS module for AlternC
- AlternC is a mutualized hosting software manager for Linux.
- It allows you to manage your websites, domains, ftp, emails, aliases,
- web statistics, mailing-lists, jabber accounts, etc.
- .
- This package is an optional module that adds HTTPS vhosts and SSL Certificates
- management to the virtual desktop. 
- .
- More information on http://www.alternc.com/
-Description-fr.UTF-8: Module HTTPS pour AlternC
- AlternC est un logiciel d'hébergement mutualisé pour serveur Linux.
- Il permet de gérer les sites web, domaines, ftp, emails, alias,
- statistiques web, listes de discussions, comptes jabber, etc.
- .
- Ce paquet est un module optionnel qui permet aux utilisateurs
- de gérer des hôtes virtuels HTTPS et des certificats SSL dans AlternC.
diff --git a/install/alternc.install.orig b/install/alternc.install.orig
deleted file mode 100644
index 10bcbacc..00000000
--- a/install/alternc.install.orig
+++ /dev/null
@@ -1,647 +0,0 @@
-#!/bin/bash
-
-# ----------------------------------------------------------------------
-# AlternC - Web Hosting System
-# Copyright (C) 2000-2012 by the AlternC Development Team.
-# https://alternc.org/
-# ----------------------------------------------------------------------
-# LICENSE
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License (GPL)
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# To read the license please visit http://www.gnu.org/copyleft/gpl.html
-# ----------------------------------------------------------------------
-# Purpose of file: Main install script, launch it anytime ;) 
-# ----------------------------------------------------------------------
-
-# Somes check before start operations
-if [ `id -u` -ne 0 ]; then
-    echo "must be launched as root"
-    exit 1
-fi
-
-for i in $*; do
-    case "$i" in
-        -f|--force)
-            export force=1; shift;;
-        -s|--slave)
-            export slave=1; shift;;
-        --)
-            break;;
-        *)
-            echo "unknown option $i"; shift;;
-    esac
-done
-
-. /usr/lib/alternc/functions.sh
-
-# Lock the jobs !
-lock_jobs
-
-# hook 
-run-parts --arg=startup /usr/lib/alternc/install.d 
-
-#######################################################################
-# Script configuration
-#
-
-# Configuration template location
-TEMPLATE_DIR="/etc/alternc/templates"
-
-# Find needed configuration files (without the initial '/')
-# replace this one unconditionnally
-CONFIG_FILES="etc/alternc/bureau.conf etc/apache2/envvars etc/alternc/apache2.conf etc/alternc/apache_logformat.conf etc/alternc/phpmyadmin.inc.php"
-
-if [ -e /etc/bind/named.conf ]; then
-    CONFIG_FILES="$CONFIG_FILES etc/bind/named.conf.options"
-fi
-if [ -d /etc/postfix ]; then
-    CONFIG_FILES="$CONFIG_FILES etc/postfix/master.cf etc/postfix/myalias.cf etc/postfix/myrelay.cf
-                  etc/postfix/mydomain.cf etc/postfix/myrelay-domain.cf etc/postfix/mymail2mail.cf etc/postfix/mygid.cf etc/postfix/myquota.cf
-                  etc/postfix/myvirtual.cf etc/postfix/mytransport.cf etc/postfix/sasl/smtpd.conf
-                  etc/alternc/postfix/postfix.cf etc/alternc/postfix/postfix-slave.cf
-                  etc/opendkim.conf etc/default/opendkim"
-fi
-if [ -e /etc/proftpd/proftpd.conf ]; then
-    CONFIG_FILES="$CONFIG_FILES etc/proftpd/proftpd.conf etc/proftpd/welcome.msg etc/proftpd/modules.conf"
-fi
-
-if [ -e /etc/default/saslauthd ]; then
-    CONFIG_FILES="$CONFIG_FILES etc/default/saslauthd"
-fi
-
-if [ -e /etc/dovecot/dovecot.conf ]; then
-    CONFIG_FILES="$CONFIG_FILES etc/dovecot/dovecot.conf etc/dovecot/dovecot-sql.conf etc/dovecot/dovecot-dict-quota.conf"
-fi
-
-INSTALLED_CONFIG_TAR="/var/lib/alternc/backups/etc-installed.tar.gz"
-
-#######################################################################
-# Look for modified configuration files
-#
-if [ -f "$INSTALLED_CONFIG_TAR" ]; then
-    CHANGED="`env LANG=C tar -zdf "$INSTALLED_CONFIG_TAR" -C / 2> /dev/null | 
-              grep -v 'postfix/main.cf' | grep -v 'Uid differs'|grep -v 'Gid differs'  |grep -v 'Mode differs' | 
-              sed -e 's#^\([^:]*\).*#    /\1#' | sort -u`"
-    if [ ! -z "$CHANGED" ]; then
-        echo "The following configuration files has changed since last AlternC"
-        echo "installation :"
-        echo "$CHANGED"
-        echo ""
-        if [ "$force" = "1" ]; then
-            echo "Replacing them as you requested."
-        else
-            echo "These configuration files should normally be modified by"
-            echo "changing the template in $TEMPLATE_DIR and then calling"
-            echo "$0 to perform the update."
-            echo ""
-            echo "Please examine the situation closely and call '$0 -f'"
-            echo "if you still want to actually overwrite these files."
-            exit 1
-        fi
-    fi
-fi
-
-# Upgrade the DATA and DB SCHEMA
-/usr/share/alternc/install/upgrade_check.sh
-# Launch upgrade of alternc modules 
-run-parts --arg=upgrade /usr/lib/alternc/install.d
-
-
-#######################################################################
-# Prepare template expansions
-#
-
-chown :alterncpanel /etc/alternc/local.sh
-. /etc/alternc/local.sh
-
-# May be missing 
-test -d /var/run/alternc || ( mkdir -p /var/run/alternc && chown alterncpanel:alterncpanel /var/run/alternc )
-
-# Create the target directory
-for i in "$ALTERNC_HTML" "$ALTERNC_MAIL" "$ALTERNC_LOGS" ; do
-  test -d "$i" || mkdir -p "$i"
-done
-
-for i in a b c d e f g h i j k l m n o p q r s t u v w x y z _ 0 1 2 3 4 5 6 7 8 9; do
-  test -d "$ALTERNC_HTML/$i" || ( mkdir -p "$ALTERNC_HTML/$i" && chown alterncpanel:alterncpanel "$ALTERNC_HTML/$i" && chmod 775 "$ALTERNC_HTML/$i" )
-  test -d "$ALTERNC_MAIL/$i" || ( mkdir -p "$ALTERNC_MAIL/$i" && chown vmail:vmail "$ALTERNC_MAIL/$i" && chmod 775 "$ALTERNC_MAIL/$i" )
-done
-
-find $ALTERNC_LOGS -maxdepth 1 -type d -exec chown alterncpanel:adm {} \; 
-find $ALTERNC_HTML -maxdepth 1 -type d -exec chown alterncpanel:alterncpanel {} \; 
-find $ALTERNC_MAIL -maxdepth 1 -type d -exec chown vmail:vmail {} \;
-
-# Check ACL
-aclcheckfile="$ALTERNC_HTML/test-acl"
-touch "$aclcheckfile"
-setfacl -m u:root:rwx "$aclcheckfile" 2>/dev/null || ( echo "Error : ACL aren't activated on $ALTERNC_HTML . AlternC can't work without it." ; test -e "$aclcheckfile" && rm -f "$aclcheckfile" ; exit 2)
-test -e "$aclcheckfile" && rm -f "$aclcheckfile"
-
-# XXX: copy-paste from debian/config
-if [ -r /etc/alternc/my.cnf ]; then
-    # make mysql configuration available as shell variables
-    # to convert from .cnf to shell syntax, we:
-    # * match only lines with "equal" in them (/=/)
-    # * remove whitespace around the = and add a left quote operator ' (;s)
-    # * add a right quote operator at the end of line (;s)
-    # * convert mysql variables into our MYSQL_ naming convention (;s)
-    # * print the result (;p)
-    eval `sed -n -e "/=/{s/ *= *\"\?/='/;s/\"\?\$/'/;s/host/MYSQL_HOST/;s/user/MYSQL_USER/;s/password/MYSQL_PASS/;s/database/MYSQL_DATABASE/;p}" /etc/alternc/my.cnf`
-    chown root:alterncpanel /etc/alternc/my.cnf
-    chmod 640 /etc/alternc/my.cnf
-fi
-
-if [ -r /etc/alternc/my_mail.cnf ]; then
-    # make mysql configuration available as shell variables
-    # to convert from .cnf to shell syntax, we:
-    # * match only lines with "equal" in them (/=/)
-    # * remove whitespace around the = and add a left quote operator ' (;s)
-    # * add a right quote operator at the end of line (;s)
-    # * convert mysql variables into our MYSQL_ naming convention (;s)
-    # * print the result (;p)
-    eval `sed -n -e "/=/{s/ *= *\"\?/='/;s/\"\?\$/'/;s/host/MYSQL_HOST/;s/user/MYSQL_MAIL_USER/;s/password/MYSQL_MAIL_PASS/;s/database/MYSQL_DATABASE/;p}" /etc/alternc/my_mail.cnf`
-    chown root:alterncpanel /etc/alternc/my_mail.cnf
-    chmod 640 /etc/alternc/my_mail.cnf
-fi
-
-WARNING="WARNING: Do not edit this file, edit the one in /etc/alternc/templates and launch alternc.install again."
-
-if [ "$slave" = "1" ]; then
-    VERSION="`dpkg -s alternc-slave | sed -n -e 's/^Version: \(.*\)/\1/p'`"
-else
-    VERSION="`dpkg -s alternc | sed -n -e 's/^Version: \(.*\)/\1/p'`"
-fi
-
-# /var/ alternc/dns/d/www.example.com
-FQDN_LETTER="`echo $FQDN | sed -e 's/.*\.\([^\.]\)[^\.]*\.[^\.]*$/\1/'`"
-if [ "$FQDN_LETTER" = "$FQDN" ] 
-then
-       FQDN_LETTER="_" 
-fi
-
-NS2_IP=`perl -e "\\$h = (gethostbyname(\"$NS2_HOSTNAME\"))[4];
-                 @ip = unpack('C4', \\$h);
-                 print join (\".\", @ip);"`
-
-if [ -z "$MONITOR_IP" ]; then
-    MONITOR_IP="127.0.0.1"
-fi
-
-PUBLIC_IP_BEGIN=$(echo $PUBLIC_IP|cut -c 1)
-
-# Secret for PhpMyAdmin sessions
-PHPMYADMIN_BLOWFISH="$(generate_string 24)"
-
-# XXX: I assume this is secure if /tmp is sticky (+t)
-# we should have a better way to deal with templating, of course.
-SED_SCRIPT="/tmp/alternc.install.sedscript"
-cat > $SED_SCRIPT <<EOF
-s\\%%hosting%%\\$HOSTING\\;
-s\\%%fqdn%%\\$FQDN\\;
-s\\%%public_ip%%\\$PUBLIC_IP\\;
-s\\%%public_ip_begin%%\\$PUBLIC_IP_BEGIN\\;
-s\\%%internal_ip%%\\$INTERNAL_IP\\;
-s\\%%monitor_ip%%\\$MONITOR_IP\\;
-s\\%%ns1%%\\$NS1_HOSTNAME\\;
-s\\%%ns2%%\\$NS2_HOSTNAME\\;
-s\\%%mx%%\\$DEFAULT_MX\\;
-s\\%%dbhost%%\\$MYSQL_HOST\\;
-s\\%%dbname%%\\$MYSQL_DATABASE\\;
-s\\%%dbuser%%\\$MYSQL_USER\\;
-s\\%%dbpwd%%\\$MYSQL_PASS\\;
-s\\%%db_mail_user%%\\$MYSQL_MAIL_USER\\;
-s\\%%db_mail_pwd%%\\$MYSQL_MAIL_PASS\\;
-s\\%%warning_message%%\\$WARNING\\;
-s\\%%fqdn_lettre%%\\$FQDN_LETTER\\;
-s\\%%version%%\\$VERSION\\;
-s\\%%ns2_ip%%\\$NS2_IP\\;
-s\\%%ALTERNC_HTML%%\\$ALTERNC_HTML\\;
-s\\%%ALTERNC_MAIL%%\\$ALTERNC_MAIL\\;
-s\\%%ALTERNC_LOGS%%\\$ALTERNC_LOGS\\;
-s\\%%PHPMYADMIN_BLOWFISH%%\\$PHPMYADMIN_BLOWFISH\\;
-EOF
-
-# hook 
-test -d /usr/lib/alternc/install.d || mkdir -p /usr/lib/alternc/install.d
-run-parts --arg=templates /usr/lib/alternc/install.d 
-
-
-######################################################################
-# Backup the Main database
-DB_BACKUP="/var/lib/alternc/backups/${MYSQL_DATABASE}-db-`date +%Y%m%d-%H:%M:%S`.gz"
-db_dump="mysqldump --defaults-file=/etc/alternc/my.cnf --add-drop-table --allow-keywords --quote-names --force --quick --add-locks --lock-tables --extended-insert ${MYSQL_DATABASE}"
-$db_dump | /bin/gzip -c > $DB_BACKUP || echo "backup of the main database failed"
-
-#######################################################################
-# Backup configuration files
-#
-BACKUP_FILE="/var/lib/alternc/backups/etc-original-`date +%Y%m%d-%H%M`.tar.gz"
-
-# Only backup what we are really going to replace
-BACKUPS=""
-for file in $CONFIG_FILES; do
-    TEMPLATE="$TEMPLATE_DIR/${file##etc/}"
-    if [ -f "$TEMPLATE" ]; then
-        BACKUPS="$BACKUPS $file"
-    fi
-done
-
-# also backup main.cf since we're doing major changes to it
-BACKUPS="$BACKUPS etc/postfix/main.cf"
-
-tar -zcf "$BACKUP_FILE" -C / $BACKUPS 2>/dev/null || true
-chmod 600 "$BACKUP_FILE"
-
-#######################################################################
-# Expand templates in the right place
-#
-echo -n "Expanding variables in configuration files:"
-for file in $CONFIG_FILES; do
-    TEMPLATE="$TEMPLATE_DIR/${file##etc/}"
-    echo -n " $file"
-    if [ -f "$TEMPLATE" ]; then
-        sed -f "$SED_SCRIPT" < $TEMPLATE > /$file
-    fi
-done
-echo "."
-rm -f $SED_SCRIPT
-
-######################################################################## 
-# Ad-hoc fixes
-#
-
-php="`ls /usr/lib/apache*/*/*php*.so | sed -e 's/^.*libphp\(.\)\.so$/php\1/' | tail -1`"
-ln -fs /etc/alternc/alternc.ini /etc/$php/apache2/conf.d/alternc.ini || true
-ln -fs /etc/alternc/alternc.ini /etc/$php/cli/conf.d/alternc.ini || true
-if [ -x /usr/sbin/apache2 ]; then
-    # hook 
-    run-parts --arg=apache2 /usr/lib/alternc/install.d 
-    
-    s=""
-    # unused from AlternC 1.0, FIXME: remove it later
-    if [ -L /etc/apache2/mods-enabled/vhost_alias.load ]
-    then
-        a2dismod vhost_alias
-        s="apache2"
-    fi 
-    if ! [ -L /etc/apache2/mods-enabled/$php.load ]
-    then
-	    a2enmod $php
-    fi
-    if ! [ -L /etc/apache2/mods-enabled/rewrite.load ]
-    then
-	    a2enmod rewrite
-    fi
-    if [ -e /etc/alternc/apache.pem ]; then
-        # We enable proftpd tls module
-        cat /etc/proftpd/modules.conf | sed -e 's/^#LoadModule mod_tls.c/LoadModule mod_tls.c/' > /etc/proftpd/modules.conf.alternc-new
-        mv /etc/proftpd/modules.conf.alternc-new /etc/proftpd/modules.conf 
-        cp /etc/proftpd/modules.conf /etc/alternc/templates/proftpd/
-        # We enable apache2 SSL : 
-        if [ ! -L /etc/apache2/mods-enabled/ssl.load ] ; then
-            a2enmod ssl
-            s="apache2"
-        fi
-        if [ ! -h /etc/apache2/conf.d/alternc-ssl.conf ] && [ -e /etc/apache2/conf.d/ ]; then
-            ln -sf /etc/alternc/apache2-ssl.conf /etc/apache2/conf.d/alternc-ssl.conf
-            s="apache2"
-        fi
-
-	# We enable dovecot SSL certificate instructions: (on wheezy we should use a new file in /etc/dovecot/conf.d/ )
-	sed -i -e 's#^ssl_cert_file.*$#ssl_cert_file = /etc/ssl/certs/ssl-cert-snakeoil.pem#' -e 's#^ssl_key_file.*$#ssl_key_file = /etc/ssl/private/ssl-cert-snakeoil.key#' /etc/dovecot/dovecot.conf
-
-    else
-        # We disable proftpd tls module
-        cat /etc/proftpd/modules.conf | sed -e 's/^LoadModule mod_tls.c/#LoadModule mod_tls.c/' > /etc/proftpd/modules.conf.alternc-new
-        mv /etc/proftpd/modules.conf.alternc-new /etc/proftpd/modules.conf 
-        cp /etc/proftpd/modules.conf /etc/alternc/templates/proftpd/
-
-	# We disable dovecot SSL certificate instructions: (on wheezy we should remove a file in /etc/dovecot/conf.d/ )
-        sed -i -e 's#^ssl_cert_file.*$#ssl_cert_file = /etc/ssl/certs/ssl-cert-snakeoil.pem#' -e 's#^ssl_key_file.*$#ssl_key_file = /etc/ssl/private/ssl-cert-snakeoil.key#' /etc/dovecot/dovecot.conf
-
-        echo "SSL not configured"
-        echo "create a certificate in /etc/alternc/apache.pem and rerun alternc.install"
-    fi
-    if [ ! -h /etc/apache2/conf.d/alternc.conf ] && [ -e /etc/apache2/conf.d/ ]; then
-        ln -sf /etc/alternc/apache2.conf /etc/apache2/conf.d/alternc.conf
-        s="apache2"
-    fi
-    if [ -e /etc/apache2/sites-enabled/000-default ]; then
-        a2dissite default
-        s="apache2"
-    fi
-    SERVICES="$SERVICES $s"
-fi
-
-# Manage sudoers.d include appearing in Squeeze:
-# if the "includedir" is not here, we add it ONLY IF visudo -c is happy.
-if ! grep -q "#includedir */etc/sudoers.d" /etc/sudoers ; then
-    if ! cat /etc/sudoers.d/* | visudo -c -f -  >/dev/null ; then
-	echo -e "\033[31m**********************************************"
-	echo "*                                            *"
-	echo "*   ALTERNC  ACTION REQUESTED                *"
-	echo "*                                            *"
-	echo "* SUDO is NOT configured properly            *"
-	echo "* check your files in /etc/sudoers.d !       *" 
-	echo "* then launch alternc.install again          *"
-	echo "*                                            *"
-	echo "**********************************************"
-	echo -e "\033[0m"
-	exit 1
-    else 
-	echo "#includedir */etc/sudoers.d" >>/etc/sudoers
-    fi
-fi
-
-# Copy postfix *_checks if they do not exist
-for file in body_checks header_checks; do
-    if [ ! -e "/etc/postfix/$file" ]; then
-        cp /usr/share/alternc/install/$file /etc/postfix
-    fi
-done
-
-# Attribute the correct rights to critical postfix files
-if [ -e /etc/postfix/myalias.cf -o -e /etc/postfix/mydomain.cf -o -e /etc/postfix/mygid.cf -o -e /etc/postfix/myrelay-domain.sh -o -e /etc/postfix/myvirtual.cf -o -e /etc/postfix/myrelay.cf -o -e /etc/postfix/myquota.cf ]; then
-    chown root:postfix /etc/postfix/my*
-    chmod 640 /etc/postfix/my*
-fi
-
-if [ ! -f /etc/postfix/main.cf ]
-then
-    echo -e "\033[31m**********************************************"
-    echo "*                                            *"
-    echo "*   ALTERNC  ACTION REQUESTED                *"
-    echo "*                                            *"
-    echo "* POSTFIX is NOT configured properly         *"
-    echo "* launch dpkg-reconfigure -plow postfix      *" 
-    echo "* and choose 'Internet Site'                 *"
-    echo "* then launch alternc.install again          *"
-    echo "*                                            *"
-    echo "**********************************************"
-    echo -e "\033[0m"
-    exit 1
-fi
-
-# configure Postfix appropriatly for our needs
-if [ "$slave" = "1" ]; then
-    postfix_conf=/etc/alternc/postfix/postfix-slave.cf
-else
-    postfix_conf=/etc/alternc/postfix/postfix.cf
-fi
-grep -v '^\ *#' $postfix_conf |while read line ; do
-   if echo "$line" | grep -qi '^smtpd_tls_dcert_file' ;then
-     line_strip=`echo "$line"|tr -d '[:blank:]'`
-     pattern="*="
-     cert_file=${line_strip#$pattern}
-     echo $cert_file
-     echo $line
-     echo $line_strip
-     if [ -e $cert_file ];then
-        postconf -e "$line"
-     else
-        echo -e "\033[31m*****************************************************"
-        echo "* The certificate file : $cert_file does not exists *"
-	echo "* If you want to be able to use SSL/TLS             *"
-        echo "* please go to https://alternc.com/SSL              *"
-	echo "* to get information on how to create a certificate *"
-        echo "* Finally relaunch alternc.install                  *"
-        echo "*****************************************************"
-	echo -e "\033[0m"
-     fi
-  else
-        postconf -e "$line"
-  fi
-done
-
-# Conviguring delivery used by Postfix
-/usr/lib/alternc/alternc_add_policy_dovecot
-
-# Bug #1215: configure mydestination when $FQDN is not in
-OLDDESTINATION=`postconf mydestination | awk -F '=' '{print $2}'`
-echo "$OLDDESTINATION" | grep -q -v "$FQDN" && postconf -e "mydestination = $FQDN, $OLDDESTINATION"
-
-# Remove phpmyadmin apache2 configuration
-rm -f /etc/apache2/conf.d/phpmyadmin.conf || true
-
-# Configure PHPMyAdmin
-include_str='include("/etc/alternc/phpmyadmin.inc.php")'
-pma_config='/etc/phpmyadmin/config.inc.php'
-
-# Sur une configuration vierge, inclure la configuration alternc
-if ! grep -e "${include_str/\"/\\\"}" $pma_config > /dev/null 2>&1; then
-    echo "$include_str;" >> $pma_config
-fi
-
-# Le template de /etc/alternc/phpmyadmin.inc.php viens d'être réappliqué, on 
-# regénére la liste des serveurs MySQL disponible dedans.
-mysql_query "select id,host,name from db_servers;" | while read id host name ; do
-echo "
-// Server #$id in db_servers
-\$i++;
-\$cfg['Servers'][\$i]['connect_type']  = 'tcp';    // How to connect to MySQL server ('tcp' or 'socket')
-\$cfg['Servers'][\$i]['auth_type']     = 'cookie';    // Authentication method (config, http or cookie based)?
-\$cfg['Servers'][\$i]['hide_db']       = 'information_schema';
-\$cfg['Servers'][\$i]['verbose']       = '$name'; // human name
-\$cfg['Servers'][\$i]['host']          = '$host'; // MySQL hostname or IP address
-" >> '/etc/alternc/phpmyadmin.inc.php'
-done
-
-# Reload incron. Useless, but who know?
-SERVICES="$SERVICES incron"
- 
-if [ -e /etc/proftpd.conf ] ; then
-    chmod 640 /etc/proftpd/proftpd.conf
-fi
-
-if [ -x /usr/sbin/locale-gen ] ; then
-    touch /etc/locale.gen
-    LOCALECHANGED=""
-    # Add de_DE ISO-8859-1, en_US ISO-8859-1, es_ES ISO-8859-1, fr_FR ISO-8859-1 to the locales : 
-    if ! grep -q "^de_DE ISO-8859-1$" /etc/locale.gen ; then
-	echo "de_DE ISO-8859-1" >>/etc/locale.gen
-	LOCALECHANGED=1
-    fi
-    if ! grep -q "^en_US ISO-8859-1$" /etc/locale.gen ; then
-	echo "en_US ISO-8859-1" >>/etc/locale.gen
-	LOCALECHANGED=1
-    fi
-    if ! grep -q "^es_ES ISO-8859-1$" /etc/locale.gen ; then
-	echo "es_ES ISO-8859-1" >>/etc/locale.gen
-	LOCALECHANGED=1
-    fi
-    if ! grep -q "^fr_FR ISO-8859-1$" /etc/locale.gen ; then 
-	echo "fr_FR ISO-8859-1" >>/etc/locale.gen
-	LOCALECHANGED=1
-    fi
-    if ! grep -q "^de_DE.UTF-8 UTF-8$" /etc/locale.gen ; then
-	echo "de_DE.UTF-8 UTF-8" >>/etc/locale.gen
-	LOCALECHANGED=1
-    fi
-    if ! grep -q "^fr_FR.UTF-8 UTF-8$" /etc/locale.gen ; then
-	echo "fr_FR.UTF-8 UTF-8" >>/etc/locale.gen
-	LOCALECHANGED=1
-    fi
-    if ! grep -q "^es_ES.UTF-8 UTF-8$" /etc/locale.gen ; then
-	echo "es_ES.UTF-8 UTF-8" >>/etc/locale.gen
-	LOCALECHANGED=1
-    fi
-    if ! grep -q "^en_US.UTF-8 UTF-8$" /etc/locale.gen ; then
-	echo "en_US.UTF-8 UTF-8" >>/etc/locale.gen
-	LOCALECHANGED=1
-    fi
-    if ! grep -q "^it_IT.UTF-8 UTF-8$" /etc/locale.gen ; then
-	echo "it_IT.UTF-8 UTF-8" >>/etc/locale.gen
-	LOCALECHANGED=1
-    fi
-    if ! grep -q "^nl_NL.UTF-8 UTF-8$" /etc/locale.gen ; then
-	echo "nl_NL.UTF-8 UTF-8" >>/etc/locale.gen
-	LOCALECHANGED=1
-    fi
-    if [ "$LOCALECHANGED" ] ; then
-	locale-gen
-    fi
-fi
-
-# remaining steps are only for the master
-if [ "$slave" = "1" ]; then
-    exit 0
-fi
-
-#######################################################################
-# populate alternc database with the mailname used by postfix to send mail for each vhost
-#
-# If mailname does not exist, create it. Fix #1495
-test -e "/etc/mailname" || hostname -f > "/etc/mailname" 
-# Allow for all the users to view /etc/mailname
-chmod +r "/etc/mailname"
-
-#######################################################################
-# Save installed files to check them during next install
-#
-tar -zcf "$INSTALLED_CONFIG_TAR" -C / $CONFIG_FILES
-
-#######################################################################
-# Last touches
-#
-
-find $ALTERNC_HTML -maxdepth 1 -type d -exec setfacl -b -k -m d:g:alterncpanel:-wx -m d:u:alterncpanel:-wx -m u:alterncpanel:-wx -m g:alterncpanel:-wx {} \;
-
-#creating log file
-if [ ! -e "/var/log/alternc/bureau.log" ]; then
-  test -d "/var/log/alternc/" || mkdir -p "/var/log/alternc/"
-  touch "/var/log/alternc/bureau.log"
-fi
-
-if [ ! -e "/var/log/alternc/update_domains.log" ]; then
-  test -d "/var/log/alternc/" || mkdir -p "/var/log/alternc/"
-  touch "/var/log/alternc/update_domains.log"
-fi
-
-# Be sure of the owner of the logs files
-chmod 640 /var/log/alternc/bureau.log /var/log/alternc/update_domains.log
-chown alterncpanel:adm /var/log/alternc/bureau.log /var/log/alternc/update_domains.log
-
-# Creating admin user if needed
-HAS_ROOT=`mysql --defaults-file=/etc/alternc/my.cnf -e "SELECT COUNT(*) FROM membres WHERE login = 'admin' OR login = 'root' and su = 1" | tail -1`
-
-if [ "$HAS_ROOT" != "1" ]; then
-    echo "Creating admin user..."
-    echo ""
-
-    if su - alterncpanel -s /bin/bash -c /usr/share/alternc/install/newone.php
-      then
-      echo "*******************************************"
-      echo "*                                         *"
-      echo "*               Admin account             *"
-      echo "*               ------------              *"
-      echo "*                                         *"
-      echo "* user: admin             password: admin *"
-      echo "*                                         *"
-      echo "* Please change this as soon as possible! *"
-      echo "*                                         *"
-      echo "*******************************************"
-    else
-	echo "Unable to create the first AlternC account (named 'admin'). newone.php returned $?. Check your MySQL database, PHP, and the /etc/alternc/local.sh file. Also check for any error above during install."
-    fi
-else
-    ##UPDATE default db_server following /etc/alternc/my.cnf values
-    if [ "$MYSQL_HOST" == "localhost" ]; then
-        MYSQL_HOST_CLIENT="localhost"
-    else
-        MYSQL_HOST_CLIENT="%"
-    fi
-    mysql --defaults-file=/etc/alternc/my.cnf -e "UPDATE db_servers SET host='$MYSQL_HOST', login='$MYSQL_USER', password='$MYSQL_PASS', client='$MYSQL_HOST_CLIENT' WHERE name='Default';"
-fi
-
-#giving vmail user read access on dovecot sql file
-chgrp vmail /etc/dovecot/dovecot.conf
-chmod g+r /etc/dovecot/dovecot.conf
-
-# We force the re-computing of the DNS zones, since we may have changed the IP address (see #460)
-/usr/bin/mysql --defaults-file="/etc/alternc/my.cnf" -B -e "update domaines set dns_action='UPDATE' WHERE gesdns=1;"
-
-# We ensure localhost is trusted to opendkim
-mkdir -p "/etc/opendkim/keys"
-touch /etc/opendkim/TrustedHosts /etc/opendkim/SigningTable /etc/opendkim/KeyTable
-grep -q "^127.0.0.1\$" /etc/opendkim/TrustedHosts || echo "127.0.0.1" >>/etc/opendkim/TrustedHosts
-grep -q "^localhost\$" /etc/opendkim/TrustedHosts || echo "localhost" >>/etc/opendkim/TrustedHosts
-grep -q "^$PUBLIC_IP\$" /etc/opendkim/TrustedHosts || echo "$PUBLIC_IP" >>/etc/opendkim/TrustedHosts
-
-# Add opendkim to service to restart
-SERVICES="$SERVICES opendkim"
-
-# hook 
-run-parts --arg=before-reload /usr/lib/alternc/install.d 
-
-#######################################################################
-# Reload services
-#
-for service in postfix bind9 apache2 dovecot cron proftpd ; do
-    invoke-rc.d $service force-reload || true
-done
-
-# We should restart apaches after all configuration stuff ...
-for service in $SERVICES; do
-    test -x /etc/init.d/$service && invoke-rc.d $service stop || true
-done
-for service in $SERVICES; do
-    test -x /etc/init.d/$service && invoke-rc.d $service start || true
-done
-
-echo "Fix all the permission. May be quite long..."
-echo "YOU CAN INTERUPT THIS BY USING Ctrl-c THEN y TO BYPASS THE ERROR." 
-/usr/lib/alternc/fixperms.sh
-echo "Compile PO files"
-
-# TODO : includes the .MO in debian package ;) 
-find /usr/share/alternc/panel/locales -maxdepth 1 -mindepth 1 -type d -name "*_*" | while read A
-do 
-    B="$A/LC_MESSAGES"
-    cd $B
-    rm -f alternc.mo alternc.po
-    msgcat --use-first *.po alternc >alternc.po
-    msgfmt alternc.po -o alternc.mo
-done
-
-# Fix some perms
-# Fix phpmyadmin import trac#1557
-test -d "/var/lib/phpmyadmin/tmp" && dpkg-statoverride --update --add www-data alterncpanel 0775 "/var/lib/phpmyadmin/tmp" 2>/dev/null || true
-test -f "/etc/phpmyadmin/config-db.php" && dpkg-statoverride --update --add www-data alterncpanel 0644 "/etc/phpmyadmin/config-db.php" 2>/dev/null || true
-
-# hook 
-run-parts --arg=end /usr/lib/alternc/install.d 
-
-# Unlock jobs !
-unlock_jobs
-
-# Rebuild all web configuration
-/usr/lib/alternc/rebuild_all_webconf.sh --force

From d1cba34548b6cf17b919c42e09b6b4e8b788fcb1 Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@sonntag.fr>
Date: Thu, 21 Jun 2018 18:20:01 +0200
Subject: [PATCH 25/30] [fix] removing alternc-ssl package altogether

---
 debian/control | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/debian/control b/debian/control
index f3c1ece3..02449f92 100644
--- a/debian/control
+++ b/debian/control
@@ -302,31 +302,3 @@ Description: Rest or get/post API for AlternC
  .
  More information at http://www.alternc.com/
 Homepage: http://www.alternc.com/
-
-Package: alternc-ssl
-Priority: optional
-Section: admin
-Architecture: all
-Depends: openssl
-    , mysql-client | mariadb-client
-    , debconf
-    , alternc (>= 3.0)
-    , php5-cli | php7.0-cli
-    , ${misc:Depends}
-Conflicts: alternc (<< 3.0)
-Description: HTTPS module for AlternC
- AlternC is a mutualized hosting software manager for Linux.
- It allows you to manage your websites, domains, ftp, emails, aliases,
- web statistics, mailing-lists, jabber accounts, etc.
- .
- This package is an optional module that adds HTTPS vhosts and SSL Certificates
- management to the virtual desktop. 
- .
- More information on http://www.alternc.com/
-Description-fr.UTF-8: Module HTTPS pour AlternC
- AlternC est un logiciel d'hébergement mutualisé pour serveur Linux.
- Il permet de gérer les sites web, domaines, ftp, emails, alias,
- statistiques web, listes de discussions, comptes jabber, etc.
- .
- Ce paquet est un module optionnel qui permet aux utilisateurs
- de gérer des hôtes virtuels HTTPS et des certificats SSL dans AlternC.

From 791e3ddb38426d998e7353eeccdfdda33a785836 Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@sonntag.fr>
Date: Thu, 21 Jun 2018 18:26:15 +0200
Subject: [PATCH 26/30] [fix] adding .debhelper to ignored files

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index ac74d790..9bb68054 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ debian/alternc-slave
 debian/alternc-squirrelmail
 debian/alternc-upnp
 debian/files
+debian/.debhelper
 lang/de_DE.po
 lang/es_ES.po
 lang/fr_FR.po

From 88f6d04f899766757d2329affcfd00e18058d0b7 Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@sonntag.fr>
Date: Thu, 21 Jun 2018 18:28:10 +0200
Subject: [PATCH 27/30] [fix] options now force + or - everywhere

---
 etc/alternc/templates/alternc/apache2.conf          | 6 +++---
 etc/alternc/templates/apache2/roundcube-ssl.conf    | 4 ++--
 etc/alternc/templates/apache2/squirrelmail-ssl.conf | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/etc/alternc/templates/alternc/apache2.conf b/etc/alternc/templates/alternc/apache2.conf
index 7fb527e6..f82ff629 100644
--- a/etc/alternc/templates/alternc/apache2.conf
+++ b/etc/alternc/templates/alternc/apache2.conf
@@ -11,7 +11,7 @@ AssignUserId www-data www-data
 
 # Deny access to the root filesystem
 <Directory />
-  Options FollowSymLinks
+  Options +FollowSymLinks
   AllowOverride None
   Order allow,deny
   Deny from all
@@ -62,13 +62,13 @@ ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
 
 <Directory /usr/share/phpmyadmin>
   AllowOverride AuthConfig Options FileInfo Limit Indexes
-  Options Indexes Includes FollowSymLinks MultiViews
+  Options +Indexes +Includes +FollowSymLinks +MultiViews
   Order allow,deny
   Allow from all
 </Directory>
 <Directory /usr/share/squirrelmail>
   AllowOverride AuthConfig Options FileInfo Limit Indexes
-  Options Indexes Includes FollowSymLinks MultiViews
+  Options +Indexes +Includes +FollowSymLinks +MultiViews
   Order allow,deny
   Allow from all
 </Directory>
diff --git a/etc/alternc/templates/apache2/roundcube-ssl.conf b/etc/alternc/templates/apache2/roundcube-ssl.conf
index 8e5e5e2f..44f3b756 100644
--- a/etc/alternc/templates/apache2/roundcube-ssl.conf
+++ b/etc/alternc/templates/apache2/roundcube-ssl.conf
@@ -19,7 +19,7 @@
 
   # Access to tinymce files
   <Directory "/usr/share/tinymce/www/">
-        Options Indexes MultiViews FollowSymLinks
+        Options +Indexes +MultiViews +FollowSymLinks
         AllowOverride None
         Order allow,deny
         allow from all
@@ -57,7 +57,7 @@
   Alias /javascript /usr/share/javascript/
 
   <Directory "/usr/share/javascript/">
-        Options FollowSymLinks MultiViews
+        Options +FollowSymLinks +MultiViews
         Order allow,deny
         Allow from all
   </Directory>
diff --git a/etc/alternc/templates/apache2/squirrelmail-ssl.conf b/etc/alternc/templates/apache2/squirrelmail-ssl.conf
index a67b8837..f5132599 100644
--- a/etc/alternc/templates/apache2/squirrelmail-ssl.conf
+++ b/etc/alternc/templates/apache2/squirrelmail-ssl.conf
@@ -19,13 +19,13 @@
   <Directory /usr/share/squirrelmail>
     php_value open_basedir /usr/share/squirrelmail:/etc/squirrelmail/:/var/lib/squirrelmail/data/:/var/spool/squirrelmail/:/etc/mailname
     php_admin_flag safe_mode off
-    Options Indexes FollowSymLinks
+    Options +Indexes +FollowSymLinks
   </Directory>
 
   Alias /javascript /usr/share/javascript/
 
   <Directory "/usr/share/javascript/">
-        Options FollowSymLinks MultiViews
+        Options +FollowSymLinks +MultiViews
         Order allow,deny
         Allow from all
   </Directory>

From 6762429c68ad2be3725a53eb258ab28ace4a78d6 Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@sonntag.fr>
Date: Thu, 21 Jun 2018 18:29:49 +0200
Subject: [PATCH 28/30] replacing allow from all by   Require all granted

---
 etc/alternc/templates/alternc/apache2.conf    | 20 ++++++++-----------
 .../templates/apache2/roundcube-ssl.conf      |  9 +++------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/etc/alternc/templates/alternc/apache2.conf b/etc/alternc/templates/alternc/apache2.conf
index f82ff629..86c351d6 100644
--- a/etc/alternc/templates/alternc/apache2.conf
+++ b/etc/alternc/templates/alternc/apache2.conf
@@ -22,15 +22,13 @@ ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
 <Directory "/usr/lib/cgi-bin">
   AllowOverride None
   Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
-  Order allow,deny
-  Allow from all
+  Require all granted
 </Directory>
 
 
 <Directory /usr/share/alternc/panel/admin/>
-  Order allow,deny
-  Allow from all
-
+  Require all granted
+  
   php_admin_flag safe_mode_gid off
   php_admin_flag safe_mode off
   AddDefaultCharset UTF-8
@@ -43,8 +41,8 @@ ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
 <Directory %%ALTERNC_HTML%% >
   AllowOverride AuthConfig FileInfo Limit Options Indexes
   Options -Indexes +Includes -FollowSymLinks +MultiViews +SymLinksIfOwnerMatch
-  Order allow,deny
-  Allow from all
+  Require all granted
+  
   php_admin_flag safe_mode_gid off
   php_admin_flag safe_mode off
   php_admin_flag enable_dl off
@@ -63,17 +61,15 @@ ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
 <Directory /usr/share/phpmyadmin>
   AllowOverride AuthConfig Options FileInfo Limit Indexes
   Options +Indexes +Includes +FollowSymLinks +MultiViews
-  Order allow,deny
-  Allow from all
+  Require all granted
 </Directory>
 <Directory /usr/share/squirrelmail>
   AllowOverride AuthConfig Options FileInfo Limit Indexes
   Options +Indexes +Includes +FollowSymLinks +MultiViews
-  Order allow,deny
-  Allow from all
+  Require all granted
 </Directory>
 <Directory /var/lib/alternc/ssl-cert-alias/>
-	      allow from all
+  Require all granted
 </Directory>
 
 <VirtualHost *:80>
diff --git a/etc/alternc/templates/apache2/roundcube-ssl.conf b/etc/alternc/templates/apache2/roundcube-ssl.conf
index 44f3b756..659eaeca 100644
--- a/etc/alternc/templates/apache2/roundcube-ssl.conf
+++ b/etc/alternc/templates/apache2/roundcube-ssl.conf
@@ -21,8 +21,7 @@
   <Directory "/usr/share/tinymce/www/">
         Options +Indexes +MultiViews +FollowSymLinks
         AllowOverride None
-        Order allow,deny
-        allow from all
+  	Require all granted
   </Directory>
 
   <Directory /var/lib/roundcube/>
@@ -30,8 +29,7 @@
     # This is needed to parse /var/lib/roundcube/.htaccess. See its
     # content before setting AllowOverride to None.
     AllowOverride All
-    order allow,deny
-    allow from all
+    Require all granted
   </Directory>
 
   # Protecting basic directories:
@@ -58,8 +56,7 @@
 
   <Directory "/usr/share/javascript/">
         Options +FollowSymLinks +MultiViews
-        Order allow,deny
-        Allow from all
+  	Require all granted
   </Directory>
 
   SSLEngine On

From fe09524ff3a7103fa51068114aa940c682b3a30b Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@sonntag.fr>
Date: Thu, 21 Jun 2018 19:15:18 +0200
Subject: [PATCH 29/30] [enh] misc styling fixes for bootstrap

---
 bureau/admin/adm_variables.php |  2 +-
 bureau/admin/dom_edit.inc.php  |  6 +++++-
 bureau/admin/styles/style.css  | 32 ++++++++++++++++----------------
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/bureau/admin/adm_variables.php b/bureau/admin/adm_variables.php
index 4507dafc..c7d276a8 100755
--- a/bureau/admin/adm_variables.php
+++ b/bureau/admin/adm_variables.php
@@ -59,7 +59,7 @@ foreach( variables_list() as $vars) {  ?>
 
  <tr class="lst">
     <td><?php ehe($vars['name']); ?></td>
- <td><input type="text" name="<?php ehe($vars['name']); ?>" value="<?php ehe($vars['value']); ?>" /></td>
+ <td><input type="text" class="int" name="<?php ehe($vars['name']); ?>" value="<?php ehe($vars['value']); ?>" style="width: 200px"/></td>
     <td><?php ehe($vars['comment']); ?></td>
  </tr>
 <?php } ?>
diff --git a/bureau/admin/dom_edit.inc.php b/bureau/admin/dom_edit.inc.php
index 1b16a315..e69c4de2 100755
--- a/bureau/admin/dom_edit.inc.php
+++ b/bureau/admin/dom_edit.inc.php
@@ -136,7 +136,11 @@ $dom->unlock();
 } else {
  __("Add this subdomain");
 } 
-?>" /></td>
+?>" />
+<?php if ($isedit) { ?>
+              <input type="button" class="inb cancel" name="cancel" value="<?php __("Cancel"); ?>" onclick="document.location = 'dom_edit.php?domain=<?php echo $domain; ?>'"/>
+<?php } ?>
+</td>
         </tr>
     </table>
 </form>
diff --git a/bureau/admin/styles/style.css b/bureau/admin/styles/style.css
index f90bda2b..4733f1cc 100644
--- a/bureau/admin/styles/style.css
+++ b/bureau/admin/styles/style.css
@@ -38,7 +38,7 @@ body {
   font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
   font-size: 14px;
   color: #000000;
-  background-color: #f8f8f8;
+  background-color: #f0f0f0;
   margin:0px;
 
 }
@@ -74,7 +74,7 @@ table {
 }
 
 thead tr th:hover, table.tlist tbody tr:first-child th:hover {
-  background-color: #f8f8f8 !important;
+  background-color: #f0f0f0 !important;
 }
 
 tbody tr:first-child {
@@ -116,8 +116,8 @@ th {
   font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
   font-size: 14px;
   color: black;
-  background: #f8f8f8;
-  font-weight: normal;
+  background: #f0f0f0;
+  font-weight: bold;
   text-align: left;
 }
 
@@ -268,7 +268,7 @@ input.inb, input.ina{
 input.inb:hover, input.ina:hover {
   border: 1px solid #999;
   text-decoration: none;
-  background-color: #F8F8F8;
+  background-color: #F0F0F0;
 }
 
 input.inb:focus, input.ina.focus {
@@ -365,7 +365,7 @@ input.inav, .inav a {
 
 input.inav:hover, .inav a:hover, a.inav:hover,
 input.ina:hover, .ina a:hover, .inb a:hover {
-  background-color: #F8F8F8;
+  background-color: #F0F0F0;
 }
 
 .ina a, a.ina, .inb a, a.inb,.inav a, a.inav {
@@ -427,7 +427,7 @@ span#newsubname {
 }
 .bff {
   border: 1px solid #999;
-  background-color: #F8F8F8;
+  background-color: #F0F0F0;
   font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
   font-size: 13px;
   padding-left: 2px;
@@ -450,15 +450,11 @@ form[action='adm_dodefquotas.php'] table {
   border-radius: 4px;
   transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
   min-height: 2em;
+  padding-left: 6px;
 }
 
 span.intleft, #usernpfx, #newdomwww {
-  display: inline-table;
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-  padding-bottom: 4px;
-  padding-top: 3px;
-  padding-right: 10px;
+    border: 0; /* disabled, not compatible with bootstrap */
 }
 
 form#formlist1 > span.int.intleft {
@@ -716,7 +712,7 @@ form[action="mman_edit.php"] > table > tbody > tr.lst1:hover, form[action="mman_
 
 #menu {
   display: block;
-  background-color: #f8f8f8;
+  background-color: #f0f0f0;
   float: left;
   padding: 0px;
   margin: 0px;
@@ -750,7 +746,7 @@ form[action="mman_edit.php"] > table > tbody > tr.lst1:hover, form[action="mman_
 
 .menu-box {
   font-size: 14px;
-  background-color: #f8f8f8;
+  background-color: #f0f0f0;
   border-top-color: transparent;
   height: auto;
 }
@@ -758,7 +754,7 @@ form[action="mman_edit.php"] > table > tbody > tr.lst1:hover, form[action="mman_
 .menu-box .menu-title {
   display: block;
   color: #000000;
-  background-color: #f8f8f8;
+  background-color: #f0f0f0;
   padding: 3px;
 }
 
@@ -771,6 +767,9 @@ form[action="mman_edit.php"] > table > tbody > tr.lst1:hover, form[action="mman_
   margin: 0 5px 5px 5px;
 }
 
+.menu-content {
+    background: white;
+}
 .menu-content ul li a span {
   margin-left: 22px;
 }
@@ -1621,6 +1620,7 @@ body.login_page {
 .login_page .block_list {
   display: flex;
   flex-flow: column;
+  padding: 0 10%;
 }
 .login_page .block_login_page {
   margin: 10px 15px;

From 0f66e2f073128a50a8567d5ef4c43b9a24b5feb6 Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@sonntag.fr>
Date: Thu, 21 Jun 2018 19:33:12 +0200
Subject: [PATCH 30/30] [enh] misc styling fixes for bootstrap

---
 bureau/admin/styles/style.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bureau/admin/styles/style.css b/bureau/admin/styles/style.css
index 4733f1cc..5c408cd1 100644
--- a/bureau/admin/styles/style.css
+++ b/bureau/admin/styles/style.css
@@ -451,6 +451,7 @@ form[action='adm_dodefquotas.php'] table {
   transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
   min-height: 2em;
   padding-left: 6px;
+  padding-right: 6px;
 }
 
 span.intleft, #usernpfx, #newdomwww {