#! /bin/sh /usr/share/dpatch/dpatch-run ## 02_fix_mlmmj_php.dpatch by Søren Boll Overgaard ## ## DP: Adapt pathes and settings used in the web interface to match the ## DP: (FHS compliant) installation paths. @DPATCH@ diff a/contrib/web/php-admin/conf/config.php b/contrib/web/php-admin/conf/config.php --- a/contrib/web/php-admin/conf/config.php +++ b/contrib/web/php-admin/conf/config.php @@ -1,6 +1,6 @@ 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,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 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 @@ -26,7 +26,7 @@ * IN THE SOFTWARE. */ -require("../conf/config.php"); +require("conf/config.php"); require("class.FastTemplate.php"); function mlmmj_boolean($name, $nicename, $text) diff a/contrib/web/php-admin/htdocs/index.php b/contrib/web/php-admin/htdocs/index.php --- a/contrib/web/php-admin/htdocs/index.php +++ b/contrib/web/php-admin/htdocs/index.php @@ -27,7 +27,7 @@ */ require("class.FastTemplate.php"); -require("../conf/config.php"); +require("conf/config.php"); $tpl = new FastTemplate($templatedir); diff a/contrib/web/php-admin/htdocs/save.php b/contrib/web/php-admin/htdocs/save.php --- a/contrib/web/php-admin/htdocs/save.php +++ b/contrib/web/php-admin/htdocs/save.php @@ -26,7 +26,7 @@ * IN THE SOFTWARE. */ -require("../conf/config.php"); +require("conf/config.php"); require("class.FastTemplate.php"); function mlmmj_boolean($name, $nicename, $text) diff a/contrib/web/php-user/example.html b/contrib/web/php-user/example.html --- a/contrib/web/php-user/example.html +++ b/contrib/web/php-user/example.html @@ -1,7 +1,7 @@ -mlmmj-webinterface +mlmmj web interface