index 5be580403ca5780c5f149ac83adada6b750b951e..2df52a22ef9dc44ad15b6c9d70bce32a05c2b5fe 100644 (file)
#! /bin/sh /usr/share/dpatch/dpatch-run
## 02_fix_mlmmj_php.dpatch by Søren Boll Overgaard <boll@tristram.fork.dk>
##
-## DP: Adapt pathes used in the web interface to match the installation paths.
+## DP: Adapt pathes and settings used in the web interface to match the
+## DP: (FHS compliant) installation paths.
@DPATCH@
@@ -19,14 +20,13 @@ diff a/contrib/web/php-admin/conf/config.php b/contrib/web/php-admin/conf/config
diff a/contrib/web/php-admin/htdocs/dot.htaccess b/contrib/web/php-admin/htdocs/dot.htaccess
--- a/contrib/web/php-admin/htdocs/dot.htaccess
+++ b/contrib/web/php-admin/htdocs/dot.htaccess
-@@ -1,4 +1,5 @@
+@@ -1,4 +1,4 @@
Require valid-user
AuthType Basic
-AuthName "mlmmj web-interface"
-AuthUserFile /home/mlmmj/htpasswd
+AuthName "mlmmj web-interface on Debian GNU/Linux"
+AuthUserFile /etc/mlmmj-php-web-admin/htpasswd
-+php_value include_path "/usr/share/mlmmj-php-web-admin"
diff a/contrib/web/php-admin/htdocs/edit.php b/contrib/web/php-admin/htdocs/edit.php
--- a/contrib/web/php-admin/htdocs/edit.php
+++ b/contrib/web/php-admin/htdocs/edit.php