SOURCES (DEVEL): mythweb-config.patch, mythweb.conf - updated to 2...

Fri Nov 4 01:59:02 CET 2005

Author: glen                         Date: Fri Nov  4 00:59:02 2005 GMT
Module: SOURCES                       Tag: DEVEL
---- Log message:
- updated to 20051104 snap

---- Files affected:
SOURCES:
   mythweb-config.patch (1.3 -> 1.3.2.1) , mythweb.conf (1.4 -> 1.4.2.1) 

---- Diffs:

================================================================
Index: SOURCES/mythweb-config.patch
diff -u SOURCES/mythweb-config.patch:1.3 SOURCES/mythweb-config.patch:1.3.2.1

--- SOURCES/mythweb-config.patch:1.3	Wed Oct 26 01:18:06 2005
+++ SOURCES/mythweb-config.patch	Fri Nov  4 01:58:57 2005
@@ -86,13 +86,13 @@
  
  // Local (web-friendly) path to the mythtv video dir (use a symlink to the real one - one will be auto-created if it can be)
      define('video_dir', 'video_dir');
---- ./mythweb/config/conf.php~	2005-01-31 07:42:41.000000000 +0200
-+++ ./mythweb/config/conf.php	2005-10-26 02:17:13.000000000 +0300
-@@ -26,7 +26,7 @@
-     define('server_domain', $_SERVER['SERVER_NAME'] ? $_SERVER['SERVER_NAME'] : $_SERVER['HTTP_HOST']);
- 
- // Email address to which php and database errors are mailed to
--    define('Error_Email', 'php_errors@'.preg_replace('/.*?\b([\w\-]+\.[\w\-]+)$/', '$1', server_domain));
+--- ./mythweb/config/conf.php~	2005-11-04 02:25:34.000000000 +0200
++++ ./mythweb/config/conf.php	2005-11-04 02:26:32.000000000 +0200
+@@ -29,7 +29,7 @@
+ //    defined as mythtv.mydomain.com in server_domain above, mail will go to
+ //    mythweb_errors at mydomain.com.
+ //
+-    define('error_email', 'mythweb_errors@'.preg_replace('/.*?\b([\w\-]+\.[\w\-]+)$/', '$1', server_domain));
 +    define('Error_Email', 'root@'.preg_replace('/.*?\b([\w\-]+\.[\w\-]+)$/', '$1', server_domain));
  
  // For the "movies" search -- set this to the word your listings provider uses to

================================================================
Index: SOURCES/mythweb.conf
diff -u SOURCES/mythweb.conf:1.4 SOURCES/mythweb.conf:1.4.2.1
--- SOURCES/mythweb.conf:1.4	Tue Oct 25 23:20:38 2005
+++ SOURCES/mythweb.conf	Fri Nov  4 01:58:57 2005
@@ -1,8 +1,13 @@
 # $Id$
 
+# Apache config for MythWeb.
+# See http://www.mythtv.org/ for information about MythTV itself.
+
 Alias /mythweb /usr/share/mythweb
 <Directory /usr/share/mythweb>
 
+# authentication is enabled if Apache has module loaded,
+# otherwise access is restricted only to localhost.
 <IfModule !mod_auth.c>
     deny from all
     allow from localhost
@@ -15,17 +20,32 @@
     allow from all
 </IfModule>
 
-# If you have nuv files that are actually mpeg2 files, uncomment this
-#AddType video/mpeg .nuv
-# If you have normal software-encoded nuv files, use this type
-#AddType video/nuppelvideo .nuv
-
-# Some special handlers for php
-#  These settings are intended for apache 2.x.  If your version of apache
-#  doesn't support php_value, or things like memory_limit aren't working
-#  as expected, then use these settings as examples for your own php.ini
-#  files.
+# MythTV now uses the correct file suffix for mpeg files, so all .nuv files
+# should actually be NuppleVideo. However, Apache probably doesn't know what
+# those are, so we should tell it.
+AddType video/nuppelvideo .nuv
+
+# Some special instructions for the PHP files of MythWeb.
 <FilesMatch "\.php$">
+    #
+    # Use the following environment settings to tell MythWeb where you want it to
+    # look to connect to the database, the name of the database to connect to, and
+    # the authentication info to use to connect.  The defaults will usually work
+    # fine unless you've changed mythtv's mysql.txt file, or are running MythWeb on
+    # a different server from your main backend.
+    #
+<IfModule mod_env.c>
+    SetEnv db_server        "localhost"
+    SetEnv db_name          "mythconverg"
+    SetEnv db_login         "mythtv"
+    SetEnv db_password      "mythtv"
+</IfModule>
+
+    #  These settings are intended for apache 2.x.  If your version of apache
+    #  doesn't support php_value, or things like memory_limit aren't working
+    #  as expected, then use these settings as examples for your own php.ini
+    #  files.
+
     php_value safe_mode                     0
 
     php_value memory_limit                  32M
@@ -50,6 +70,30 @@
 # php_flag does not work in older versions of php
     php_flag output_handler                 "NULL"
     php_flag short_open_tag                 "On"
+
+#
+# The settings below relate specifically to mod_rewrite and the rewrite engine
+# used to make the MythWeb user experience a little easier to deal with by
+# simplifying the URL's neeced to access the various sections.  Do not touch
+# these settings.
+#
+
+<IfModule mod_rewrite.c>
+# Turn on the rewrite engine
+    RewriteEngine  on
+
+# Skip out early if we've already been through rewrites,
+# or if this is a /css/, /js/ or /cache/ directory request.
+    RewriteRule    ^(css|js|cache|images|image_cache|video_dir|mythvideo|themes|[a-z_]+\.php)(/|$)     -                           [L]
+
+# Redirect most of the remaining URL requests to the main cooktools script.
+# It will then handle any requests given to it.
+    RewriteRule     ^(.*)$                  mythweb.php/$1              [QSA,L]
+
+# If you're experiencing trouble with the previous line in your copy of apache,
+# you could also use something like:
+#    RewriteRule     ^([\w\-]+(/.*)?)?$      mythweb.php?PATH_INFO=/$1   [L,QSA]
+</IfModule>
 
 </FilesMatch>
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/mythweb-config.patch?r1=1.3&r2=1.3.2.1&f=u
    http://cvs.pld-linux.org/SOURCES/mythweb.conf?r1=1.4&r2=1.4.2.1&f=u


