ispman/debian/patches 00list, NONE, 1.1 01_liblocations.dpatch, NONE, 1.1 02_ldif_patch.dpatch, NONE, 1.1

Joerg Delker <[email protected]>
Newsgroups gmane.comp.isp.ispman.cvs
Message-ID <[email protected]> 
Update of /cvsroot/ispman/ispman/debian/patches
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv17140/debian/patches

Added Files:
	00list 01_liblocations.dpatch 02_ldif_patch.dpatch 
Log Message:
added debian packaging

--- NEW FILE: 02_ldif_patch.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 02_ldif_patch.dpatch by  <thp-IfcUDwK111A0aPf6s/[email protected]>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: This patch provides useful defaults for debian systems with apache,
## DP: bind9 and exim4

@DPATCH@
diff -urNad ispman-1.3~/install-data/ldifs/conf.account_vars.ldif ispman-1.3/install-data/ldifs/conf.account_vars.ldif
--- ispman-1.3~/install-data/ldifs/conf.account_vars.ldif	2005-10-09 10:48:58.000000000 -0400
+++ ispman-1.3/install-data/ldifs/conf.account_vars.ldif	2006-04-05 09:37:59.000000000 -0400
@@ -33,7 +33,7 @@
 ispmanVarAlias: Default homedirectory location
 ispmanModule: account_vars
 objectclass: ispmanConfVar
-ispmanVal: /ispman/domains
+ispmanVal: /var/ispman/domains
 ispmanQuestion: Directory where all accounts be created. Domain accounts are created just beneath this directory and the domain user/virtual hosts directories are created underneath that
 
 dn: ispmanVar=defaultUserMailQuota, ispmanModule=account_vars, ou=conf, %%ldapBaseDN%%
diff -urNad ispman-1.3~/install-data/ldifs/conf.apache_vars.ldif ispman-1.3/install-data/ldifs/conf.apache_vars.ldif
--- ispman-1.3~/install-data/ldifs/conf.apache_vars.ldif	2005-10-09 10:48:58.000000000 -0400
+++ ispman-1.3/install-data/ldifs/conf.apache_vars.ldif	2006-04-05 09:46:00.000000000 -0400
@@ -9,7 +9,7 @@
 ispmanVarAlias: Apache vhost file
 ispmanModule: apache_vars
 objectclass: ispmanConfVar
-ispmanVal: /etc/httpd/conf/vhosts.conf
+ispmanVal: /etc/apache/conf.d/ispmanhosts.conf
 ispmanQuestion: The file or directory where I should create VirtualHost Entries for apache,<br>remember to include this file or directory in the httpd.conf
 
 dn: ispmanVar=apacheVhostsStyle, ispmanModule=apache_vars, ou=conf, %%ldapBaseDN%%
@@ -49,7 +49,7 @@
 ispmanVarAlias: Apache stop command
 ispmanModule: apache_vars
 objectclass: ispmanConfVar
-ispmanVal: /etc/rc.d/init.d/httpd stop
+ispmanVal: /etc/init.d/apache stop
 ispmanQuestion: Command to stop apache
 
 dn: ispmanVar=apacheReloadCommand, ispmanModule=apache_vars, ou=conf, %%ldapBaseDN%%
@@ -57,7 +57,7 @@
 ispmanVar: apacheReloadCommand
 ispmanModule: apache_vars
 objectclass: ispmanConfVar
-ispmanVal: /etc/rc.d/init.d/httpd reload
+ispmanVal: /etc/init.d/apache reload
 ispmanQuestion: Command to reload apache.<br>If this command is present then it will be used instead <br>of stoping and starting the daemon
 
 dn: ispmanVar=apacheStartCommand, ispmanModule=apache_vars, ou=conf, %%ldapBaseDN%%
@@ -65,7 +65,7 @@
 ispmanVarAlias: Apache start command
 ispmanModule: apache_vars
 objectclass: ispmanConfVar
-ispmanVal: /etc/rc.d/init.d/httpd start
+ispmanVal: /etc/init.d/apache start
 ispmanQuestion: Command to start apache
 
 dn: ispmanVar=apacheLogsDirectory, ispmanModule=apache_vars, ou=conf, %%ldapBaseDN%%
@@ -73,7 +73,7 @@
 ispmanVarAlias: Apache logs directory
 ispmanModule: apache_vars
 objectclass: ispmanConfVar
-ispmanVal: /ispman/logs
+ispmanVal: /var/log/apache/%vhost%
 ispmanQuestion: Directory where Apache's logs are kept (relative path will be appended to vhost's homedir). Allowed tokens: %vhost%, %domain% (will be substituted with actual vhost/domain name on creation of vhost)
 
 dn: ispmanVar=apacheStatDirectory, ispmanModule=apache_vars, ou=conf, %%ldapBaseDN%%
@@ -81,7 +81,7 @@
 ispmanVarAlias: Apache stats directory
 ispmanModule: apache_vars
 objectclass: ispmanConfVar
-ispmanVal: /ispman/domain
+ispmanVal: /var/log/apache/%vhost%
 ispmanQuestion: Directory where Apache's Stats are kept (relative path will be appended to vhost's homedir). Allowed tokens: %vhost%, %domain% (will be substituted with actual vhost/domain name on creation of vhost)
 
 dn: ispmanVar=apacheWebalizerPath, ispmanModule=apache_vars, ou=conf, %%ldapBaseDN%%
@@ -89,7 +89,7 @@
 ispmanVarAlias: Webalizer command
 ispmanModule: apache_vars
 objectclass: ispmanConfVar
-ispmanVal: /usr/local/bin/webalizer
+ispmanVal: /usr/bin/webalizer
 ispmanQuestion: Path to webalizer command
 
 dn: ispmanVar=modLDAPUserDir, ispmanModule=apache_vars, ou=conf, %%ldapBaseDN%%
@@ -105,7 +105,7 @@
 ispmanVarAlias: Apache graceful reload command
 ispmanModule: apache_vars
 objectclass: ispmanConfVar
-ispmanVal: /etc/rc.d/init.d/httpd graceful
+ispmanVal: /usr/sbin/apachectl graceful
 ispmanQuestion: To use the ispman.makelogs command line tool for logfile processing you need to specify the command to gracefully restart your apache.
 
 dn: ispmanVar=apacheGracefulTime, ispmanModule=apache_vars, ou=conf, %%ldapBaseDN%%
diff -urNad ispman-1.3~/install-data/ldifs/conf.dns_vars.ldif ispman-1.3/install-data/ldifs/conf.dns_vars.ldif
--- ispman-1.3~/install-data/ldifs/conf.dns_vars.ldif	2005-10-09 10:48:58.000000000 -0400
+++ ispman-1.3/install-data/ldifs/conf.dns_vars.ldif	2006-04-05 09:45:25.000000000 -0400
@@ -9,7 +9,7 @@
 ispmanVarAlias: Named data directory
 ispmanModule: dns_vars
 objectclass: ispmanConfVar
-ispmanVal: /var/named
+ispmanVal: /etc/bind
 ispmanQuestion: Named Directory
 
 dn: ispmanVar=namedIspmanSubDir, ispmanModule=dns_vars, ou=conf, %%ldapBaseDN%%
@@ -49,7 +49,7 @@
 ispmanVarAlias: Named Config File
 ispmanModule: dns_vars
 objectclass: ispmanConfVar
-ispmanVal: /etc/named.ispman.conf
+ispmanVal: /etc/bind/named.ispman.conf
 ispmanQuestion: Configuration file for named
 
 dn: ispmanVar=namedUser, ispmanModule=dns_vars, ou=conf, %%ldapBaseDN%%
@@ -57,7 +57,7 @@
 ispmanVarAlias: Named User
 ispmanModule: dns_vars
 objectclass: ispmanConfVar
-ispmanVal: named
+ispmanVal: bind
 ispmanQuestion: Username who runs named. Files/Directories created will be owned by the user
 
 dn: ispmanVar=primaryDNS, ispmanModule=dns_vars, ou=conf, %%ldapBaseDN%%
@@ -129,7 +129,7 @@
 ispmanVarAlias: Named Start Command
 ispmanModule: dns_vars
 objectclass: ispmanConfVar
-ispmanVal: /etc/rc.d/init.d/named start
+ispmanVal: /etc/init.d/bind9 start
 ispmanQuestion: Command to start named
 
 dn: ispmanVar=namedStopCommand, ispmanModule=dns_vars, ou=conf, %%ldapBaseDN%%
@@ -137,7 +137,7 @@
 ispmanVarAlias: Named Stop Command
 ispmanModule: dns_vars
 objectclass: ispmanConfVar
-ispmanVal: /etc/rc.d/init.d/named stop
+ispmanVal: /etc/init.d/bind9 stop
 ispmanQuestion: Command to stop named
 
 dn: ispmanVar=namedReloadCommand, ispmanModule=dns_vars, ou=conf, %%ldapBaseDN%%
@@ -145,7 +145,7 @@
 ispmanVarAlias: Named Reload Command
 ispmanModule: dns_vars
 objectclass: ispmanConfVar
-ispmanVal: /etc/rc.d/init.d/named reload
+ispmanVal: /etc/init.d/bind9 reload
 ispmanQuestion: Command to reload named
 
 dn: ispmanVar=dnsMasterEmail, ispmanModule=dns_vars, ou=conf, %%ldapBaseDN%%
@@ -177,7 +177,7 @@
 ispmanVarAlias: DNS Backend
 ispmanModule: dns_vars
 objectclass: ispmanConfVar
-ispmanVal: bind8
+ispmanVal: bind9
 ispmanQuestion: DNS backend to use (bind8, bind9, bind9-sdbldap, tinydns)
 
 dn: ispmanVar=catchAllCNAME, ispmanModule=dns_vars, ou=conf, %%ldapBaseDN%%
diff -urNad ispman-1.3~/install-data/ldifs/conf.mail_vars.ldif ispman-1.3/install-data/ldifs/conf.mail_vars.ldif
--- ispman-1.3~/install-data/ldifs/conf.mail_vars.ldif	2005-10-09 10:48:58.000000000 -0400
+++ ispman-1.3/install-data/ldifs/conf.mail_vars.ldif	2006-04-05 09:47:56.000000000 -0400
@@ -9,16 +9,16 @@
 ispmanVarAlias: SMTP reload command
 ispmanModule: mail_vars
 objectclass: ispmanConfVar
-ispmanVal: /usr/sbin/postfix reload
-ispmanQuestion: Command to reload the postfix SMTP server
+ispmanVal: /etc/init.d/exim4 reload
+ispmanQuestion: Command to reload the SMTP server
 
 dn: ispmanVar=makeMapCommand, ispmanModule=mail_vars, ou=conf, %%ldapBaseDN%%
 ispmanVar: makeMapCommand
 ispManVarAlias: Server Maps command
 ispmanModule: mail_vars
 objectclass: ispmanConfVar
-ispmanVal: /usr/sbin/postmap
-ispmanQuestion: Command to make postfix maps
+ispmanVal: /bin/true
+ispmanQuestion: Command to make postfix maps (/bin/true for exim)
 
 dn: ispmanVar=smtpServerConfDir, ispmanModule=mail_vars, ou=conf, %%ldapBaseDN%%
 ispmanVar: smtpServerConfDir
@@ -33,7 +33,7 @@
 ispmanVarAlias: Mailbox Prefix
 ispmanModule: mail_vars
 objectclass: ispmanConfVar
-ispmanVal: user.
+ispmanVal: Maildir/
 ispmanQuestion: The mailbox prefix. For Cyrus set this to 'user.'. For Courier set this to Maildir/
 
 dn: ispmanVar=imapServerBackend, ispmanModule=mail_vars, ou=conf, %%ldapBaseDN%%
@@ -41,7 +41,7 @@
 ispmanVarAlias: IMAP server
 ispmanModule: mail_vars
 objectclass: ispmanConfVar
-ispmanVal: cyrus
+ispmanVal: courier
 ispmanQuestion: IMAP server backend. currently supported are 'cyrus' and 'courier'
 
 
diff -urNad ispman-1.3~/install-data/ldifs/conf.sys_vars.ldif ispman-1.3/install-data/ldifs/conf.sys_vars.ldif
--- ispman-1.3~/install-data/ldifs/conf.sys_vars.ldif	2005-10-09 10:48:58.000000000 -0400
+++ ispman-1.3/install-data/ldifs/conf.sys_vars.ldif	2006-04-05 09:49:02.000000000 -0400
@@ -34,7 +34,7 @@
 ispmanVarAlias: Installation Directory
 ispmanModule: sys_vars
 ispmanVal: %%installDir%%
-ispmanQuestion: Directory where you want to install ispman components.<br>You may choose to install in on an NFS partition so that you can share the same files with multiple machines.<br>It is recommended to install at /opt/ispman
+ispmanQuestion: Directory where you want to install ispman components.<br>You may choose to install in on an NFS partition so that you can share the same files with multiple machines.<br>There should be no need to touch this.
 
 dn: ispmanVar=rootEmail, ispmanModule=sys_vars, ou=conf, %%ldapBaseDN%%
 objectclass: ispmanConfVar

--- NEW FILE: 00list ---
01_liblocations.dpatch
02_ldif_patch.dpatch

--- NEW FILE: 01_liblocations.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_liblocations.dpatch by  <thp-IfcUDwK111A0aPf6s/[email protected]>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad ispman-1.3~/bin/ispman-agent ispman-1.3/bin/ispman-agent
--- ispman-1.3~/bin/ispman-agent	2006-06-15 15:50:33.000000000 +0200
+++ ispman-1.3/bin/ispman-agent	2006-06-15 16:00:26.000000000 +0200
@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+use lib qw(/usr/share/ispman/lib /usr/share/ispman/ /etc/ispman);
 # the prefered way to run this tool is via daemon tools
 # see http://cr.yp.to/daemontools.html
 
diff -urNad ispman-1.3~/bin/ispman.addAdmin ispman-1.3/bin/ispman.addAdmin
--- ispman-1.3~/bin/ispman.addAdmin	2006-06-15 15:50:33.000000000 +0200
+++ ispman-1.3/bin/ispman.addAdmin	2006-06-15 16:00:26.000000000 +0200
[...2317 lines suppressed...]
 # $Id: 01_liblocations.dpatch,v 1.1 2006/06/15 14:46:37 jdelker Exp $
 
diff -urNad ispman-1.3~/ispman-web/cgi-bin/css.cgi ispman-1.3/ispman-web/cgi-bin/css.cgi
--- ispman-1.3~/ispman-web/cgi-bin/css.cgi	2006-06-15 15:50:34.000000000 +0200
+++ ispman-1.3/ispman-web/cgi-bin/css.cgi	2006-06-15 16:00:26.000000000 +0200
@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+use lib qw(/usr/share/ispman/lib /usr/share/ispman/ /etc/ispman);
 use vars qw($VAR1 $r $MOD_PERL);
 if ( exists $ENV{'GATEWAY_INTERFACE'}
     && ( $MOD_PERL = $ENV{'GATEWAY_INTERFACE'} =~ /^CGI-Perl\// ) )
diff -urNad ispman-1.3~/ispman-web/cgi-bin/whois.cgi ispman-1.3/ispman-web/cgi-bin/whois.cgi
--- ispman-1.3~/ispman-web/cgi-bin/whois.cgi	2006-06-15 15:50:34.000000000 +0200
+++ ispman-1.3/ispman-web/cgi-bin/whois.cgi	2006-06-15 16:00:26.000000000 +0200
@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+use lib qw(/usr/share/ispman/lib /usr/share/ispman/ /etc/ispman);
 BEGIN {
     use FindBin;
     unshift @INC, ( $FindBin::Bin, "$FindBin::Bin/../lib" );
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.