1
0
mirror of https://github.com/postfixadmin/postfixadmin.git synced 2025-08-06 06:42:37 +03:00

attempt at fixing various .deb issues - link templates_c to /var/cache/postfixadmin; add postfixadmin-cli to deb and symlink into /usr/bin

This commit is contained in:
David Goodwin
2017-09-07 15:00:52 +01:00
parent 252d42dcc0
commit dd06aa75e0
6 changed files with 12 additions and 4 deletions

View File

@@ -7,7 +7,7 @@ Index: postfixadmin/config.inc.php
*/ */
+// Debian: 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'); +require_once(dirname(__FILE__) . '/dbconfig.inc.php');
+if (!isset($dbserver) || empty($dbserver)) { +if (!isset($dbserver) || empty($dbserver)) {
+ $dbserver = 'localhost'; + $dbserver = 'localhost';
+} +}

View File

@@ -2,4 +2,6 @@ usr/share/postfixadmin
usr/share/postfixadmin/scripts usr/share/postfixadmin/scripts
usr/share/postfixadmin/css usr/share/postfixadmin/css
usr/share/doc/postfixadmin usr/share/doc/postfixadmin
var/cache/postfixadmin
usr/bin
etc/postfixadmin etc/postfixadmin

View File

@@ -1,2 +1,2 @@
etc/postfixadmin/config.inc.php usr/share/postfixadmin/config.inc.php etc/postfixadmin/config.inc.php usr/share/postfixadmin/config.inc.php
usr/bin/postfixadmin-cli usr/share/postfixadmin/scripts/postfixadmin-cli.php var/cache/postfixadmin usr/share/postfixadmin/templates_c

View File

@@ -23,6 +23,12 @@ fi
if [ -d /usr/share/postfixadmin/templates_c ]; then if [ -d /usr/share/postfixadmin/templates_c ]; then
find /usr/share/postfixadmin/templates_c -type f -exec rm -r {} \; find /usr/share/postfixadmin/templates_c -type f -exec rm -r {} \;
fi fi
if [ -d /var/cache/postfixadmin ]; then
find /var/cache/postfixadmin -type f -exec rm -r {} \;
chown www-data /var/cache/postfixadmin
fi
#DEBHELPER# #DEBHELPER#
exit 0 exit 0

View File

@@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
set -e set -e
. /usr/share/debconf/confmodule . /usr/share/debconf/confmodule

2
debian/rules vendored
View File

@@ -33,7 +33,7 @@ install: build
dh_install dh_install
dh_apache2 dh_apache2
mv debian/postfixadmin/usr/share/postfixadmin/config.inc.php debian/postfixadmin/etc/postfixadmin/config.inc.php mv debian/postfixadmin/usr/share/postfixadmin/config.inc.php debian/postfixadmin/etc/postfixadmin/config.inc.php
find debian/postfixadmin -name .svn | xargs -r rm -r ln -s /usr/share/postfixadmin/scripts/postfixadmin-cli debian/postfixadmin/usr/bin/postfixadmin-cli
# Build architecture-independent files here. # Build architecture-independent files here.
binary-indep: build install binary-indep: build install