mirror of
https://github.com/postfixadmin/postfixadmin.git
synced 2024-09-19 19:22:14 +02:00
update patches - they appear to now apply...
git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1852 a1433add-5e2c-0410-b055-b7f2511e0802
This commit is contained in:
parent
a3b19ed23e
commit
1fc6f3b03e
34
debian/patches/0001-db_credentials.patch
vendored
34
debian/patches/0001-db_credentials.patch
vendored
@ -6,23 +6,26 @@ Subject: db_credentials
|
||||
config.inc.php | 19 ++++++++++++-------
|
||||
1 file changed, 12 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/config.inc.php b/config.inc.php
|
||||
index e41e7c3..538446d 100644
|
||||
Index: postfixadmin/config.inc.php
|
||||
===================================================================
|
||||
--- a/config.inc.php
|
||||
+++ b/config.inc.php
|
||||
@@ -16,6 +16,11 @@
|
||||
@@ -15,6 +15,14 @@
|
||||
* Contains configuration options.
|
||||
*/
|
||||
|
||||
+// This loads the automatic generated DB credentials from /etc/postfixadmin/dbconfig.inc.php
|
||||
+
|
||||
+// Debian: This loads the automatic generated DB credentials from
|
||||
+// /etc/postfixadmin/dbconfig.inc.php
|
||||
+require_once('dbconfig.inc.php');
|
||||
+if (!isset($dbserver) || empty($dbserver))
|
||||
+if (!isset($dbserver) || empty($dbserver)) {
|
||||
+ $dbserver='localhost';
|
||||
+}
|
||||
+
|
||||
/*****************************************************************
|
||||
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
* You have to set $CONF['configured'] = true; before the
|
||||
@@ -23,7 +28,7 @@
|
||||
@@ -22,7 +30,7 @@
|
||||
* Doing this implies you have changed this file as required.
|
||||
* i.e. configuring database etc; specifying setup.php password etc.
|
||||
*/
|
||||
@ -31,20 +34,11 @@ index e41e7c3..538446d 100644
|
||||
|
||||
// In order to setup Postfixadmin, you MUST specify a hashed password here.
|
||||
// To create the hash, visit setup.php in a browser and type a password into the field,
|
||||
@@ -33,7 +38,7 @@ $CONF['setup_password'] = 'changeme';
|
||||
// Postfix Admin Path
|
||||
// Set the location of your Postfix Admin installation here.
|
||||
// YOU MUST ENTER THE COMPLETE URL e.g. http://domain.tld/postfixadmin
|
||||
-$CONF['postfix_admin_url'] = '';
|
||||
+$CONF['postfix_admin_url'] = '/postfixadmin';
|
||||
|
||||
// shouldn't need changing.
|
||||
$CONF['postfix_admin_path'] = dirname(__FILE__);
|
||||
@@ -46,11 +51,11 @@ $CONF['default_language'] = 'en';
|
||||
// mysql = MySQL 3.23 and 4.0, 4.1 or 5
|
||||
// mysqli = MySQL 4.1+
|
||||
@@ -81,11 +89,11 @@
|
||||
// mysqli = MySQL 4.1+ or MariaDB
|
||||
// pgsql = PostgreSQL
|
||||
-$CONF['database_type'] = 'mysql';
|
||||
// sqlite = SQLite 3
|
||||
-$CONF['database_type'] = 'mysqli';
|
||||
-$CONF['database_host'] = 'localhost';
|
||||
-$CONF['database_user'] = 'postfix';
|
||||
-$CONF['database_password'] = 'postfixadmin';
|
||||
@ -57,3 +51,5 @@ index e41e7c3..538446d 100644
|
||||
// If you need to specify a different port for a MYSQL database connection, use e.g.
|
||||
// $CONF['database_host'] = '172.30.33.66:3308';
|
||||
// If you need to specify a different port for POSTGRESQL database connection
|
||||
|
||||
|
||||
|
21
debian/patches/0002-dovecotpw.patch
vendored
21
debian/patches/0002-dovecotpw.patch
vendored
@ -1,21 +0,0 @@
|
||||
Description: Use doveadm pw instead of dovecotpw by default
|
||||
Newer versions of dovecot no longer have the dovecotpw command.
|
||||
Author: Gaudenz Steinlin <gaudenz@debian.org>
|
||||
Forwarded: not-needed
|
||||
Applied-Upstream: fixed upstream in version 2.91
|
||||
Last-Update: 2014-10-03
|
||||
---
|
||||
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
|
||||
Index: postfixadmin/config.inc.php
|
||||
===================================================================
|
||||
--- postfixadmin.orig/config.inc.php 2014-10-02 17:21:08.000000000 +0200
|
||||
+++ postfixadmin/config.inc.php 2014-10-03 10:40:32.836919086 +0200
|
||||
@@ -111,7 +111,7 @@
|
||||
$CONF['authlib_default_flavor'] = 'md5raw';
|
||||
|
||||
// If you use the dovecot encryption method: where is the dovecotpw binary located?
|
||||
-$CONF['dovecotpw'] = "/usr/sbin/dovecotpw";
|
||||
+$CONF['dovecotpw'] = "/usr/bin/doveadm pw";
|
||||
|
||||
// Minimum length required for passwords. Postfixadmin will not
|
||||
// allow users to set passwords which are shorter than this value.
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@ -1,2 +1 @@
|
||||
0001-db_credentials.patch
|
||||
0002-dovecotpw.patch
|
||||
|
Loading…
Reference in New Issue
Block a user