From 8b04e0d33e44a2ab484817b487adfbc7aa5bf4fa Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@octopuce.fr>
Date: Tue, 22 Dec 2015 12:25:25 +0100
Subject: [PATCH] first patch for Jessie

---
 jessie/changelog.diff | 13 +++++++++++++
 jessie/control.diff   | 38 ++++++++++++++++++++++++++++++++++++++
 jessie/patch.sh       | 15 +++++++++++++++
 jessie/vhost.conf     | 22 ++++++++++++++++++++++
 4 files changed, 88 insertions(+)
 create mode 100644 jessie/changelog.diff
 create mode 100644 jessie/control.diff
 create mode 100755 jessie/patch.sh
 create mode 100644 jessie/vhost.conf

diff --git a/jessie/changelog.diff b/jessie/changelog.diff
new file mode 100644
index 00000000..bd7f46b7
--- /dev/null
+++ b/jessie/changelog.diff
@@ -0,0 +1,13 @@
+--- 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.9) 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>  Wed,  3 Sep 2015 15:54:12 +0200
++
+ alternc (3.2.9) oldstable; urgency=low
+
+  * Version identical to 3.1 for Squeeze
diff --git a/jessie/control.diff b/jessie/control.diff
new file mode 100644
index 00000000..33c0e910
--- /dev/null
+++ b/jessie/control.diff
@@ -0,0 +1,38 @@
+--- control.wheezy	2015-12-22 12:11:43.355751408 +0100
++++ control	2015-12-22 12:12:45.489205807 +0100
+@@ -15,7 +15,7 @@
+            , bash (>= 4)
+            , acl
+ Depends: debianutils (>= 1.13.1)
+-       , apache2-mpm-itk
++       , libapache2-mpm-itk
+        , libapache2-mod-php5
+        , php5-mysql
+        , phpmyadmin
+@@ -39,7 +39,7 @@
+        , adduser
+        , mysql-client
+        , dnsutils
+-       , dovecot-common (>=1:2.1.7)
++       , dovecot-core (>=1:2.1.7)
+        , dovecot-imapd
+        , dovecot-pop3d
+        , dovecot-mysql
+@@ -102,7 +102,7 @@
+ 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
+          , php5-mysql
+          , phpmyadmin
+@@ -127,7 +127,7 @@
+          , adduser
+          , mysql-client
+          , sudo
+-         , dovecot-common (>= 1:2.1.7)
++         , dovecot-core (>= 1:2.1.7)
+          , dovecot-imapd
+          , dovecot-pop3d
+          , dovecot-mysql
diff --git a/jessie/patch.sh b/jessie/patch.sh
new file mode 100755
index 00000000..7a3962c4
--- /dev/null
+++ b/jessie/patch.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# Migrate a svn 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/
diff --git a/jessie/vhost.conf b/jessie/vhost.conf
new file mode 100644
index 00000000..86ebbf8d
--- /dev/null
+++ b/jessie/vhost.conf
@@ -0,0 +1,22 @@
+<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
+  </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>
+