From 73b7746f58b064570c5045780e50f6b17624aef1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= <anarcat@anarcat.ath.cx>
Date: Thu, 10 Apr 2008 19:30:59 +0000
Subject: [PATCH] add missing configuration that wasn't ran properly when
 installing, since initrep.sh was removed from the installation at some point.
 remove initrep.sh altogether since it's not required anymore. Closes: #1109.

---
 .gitattributes     |  1 -
 debian/postinst    |  4 ++++
 debian/rules       |  9 ++++++++
 install/initrep.sh | 54 ----------------------------------------------
 4 files changed, 13 insertions(+), 55 deletions(-)
 delete mode 100755 install/initrep.sh

diff --git a/.gitattributes b/.gitattributes
index 9f87d6d5..5a3b5661 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -296,7 +296,6 @@ install/body_checks -text
 install/domaines.template -text
 install/dopo.sh -text
 install/header_checks -text
-install/initrep.sh -text
 install/mysql.sh -text
 install/mysql.sql -text
 install/newone.php -text
diff --git a/debian/postinst b/debian/postinst
index da148df9..244a0937 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -41,6 +41,10 @@ case "$1" in
     # ajoute l'user postfix au groupe sasl
     adduser --quiet postfix sasl
 
+    # corriger les permissions du chroot
+    mkdir -p /var/spool/postfix/var/run/saslauthd || true
+    dpkg-statoverride --quiet --update --add root sasl 710 /var/spool/postfix/var/run/saslauthd  || true
+
     # build local.sh if it does not exist
     if [ ! -f $CONFIGFILE ]; then
         cat > $CONFIGFILE <<EOF
diff --git a/debian/rules b/debian/rules
index 15d008ae..9c3f35c2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,6 +60,15 @@ install: build
 	chown -R www-data:www-data debian/alternc/var/log/alternc
 	chown -R www-data:www-data debian/alternc/var/alternc/tmp
 
+    for sub in dns dns/redir mail html apacheconf
+    do
+        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
+            mkdir -p $DATA/$sub/$i
+            chown www-data $DATA/$sub/$i
+        done
+    done
+
 	chmod a+x debian/alternc/usr/share/alternc/install/alternc.install
 	chmod a+x debian/alternc/usr/share/alternc/install/dopo.sh
 	chmod a+x debian/alternc/usr/share/alternc/install/mysql.sh
diff --git a/install/initrep.sh b/install/initrep.sh
deleted file mode 100755
index 4de985f2..00000000
--- a/install/initrep.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-#
-# $Id: initrep.sh,v 1.13 2004/11/10 22:28:34 anonymous Exp $
-# ----------------------------------------------------------------------
-# AlternC - Web Hosting System
-# Copyright (C) 2002 by the AlternC Development Team.
-# http://alternc.org/
-# ----------------------------------------------------------------------
-# Based on:
-# Valentin Lacambre's web hosting softwares: http://altern.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
-# ----------------------------------------------------------------------
-# Original Author of file: Jerome Moinet, Benjamin Sonntag
-# Purpose of file: Create all the directories for AlternC in /$DATA/
-# ----------------------------------------------------------------------
-#
-DATA="/var/alternc"
-
-for sub in bureau cgi-bin db dns/redir exec.usr html mail mla tmp apacheconf
-do
-  mkdir -p $DATA/$sub
-done
-
-chmod 1777 $DATA/tmp
-
-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
-    for sub in dns dns/redir mail html apacheconf
-    do
-      mkdir -p $DATA/$sub/$i
-      chown www-data $DATA/$sub/$i
-    done
-done
-
-touch $DATA/apacheconf/override_php.conf
-mkdir -p /var/log/alternc
-chown www-data:www-data /var/log/alternc
-chgrp -R www-data /etc/alternc
-
-mkdir -p /var/spool/postfix/var/run/saslauthd
-dpkg-statoverride --quiet --update --add root sasl 710 /var/spool/postfix/var/run/saslauthd  || true