]> git.pld-linux.org Git - packages/mythplugins.git/commitdiff
- merged from DEVEL
authorElan Ruusamäe <glen@pld-linux.org>
Mon, 13 Feb 2006 01:14:56 +0000 (01:14 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    mythplugins-configure.patch -> 1.2
    mythplugins-lib64.patch -> 1.2
    mythplugins-paths.patch -> 1.2
    mythweb-config.patch -> 1.4
    mythweb.conf -> 1.5

mythplugins-configure.patch [deleted file]
mythplugins-lib64.patch [new file with mode: 0644]
mythplugins-paths.patch [new file with mode: 0644]
mythweb-config.patch
mythweb.conf

diff --git a/mythplugins-configure.patch b/mythplugins-configure.patch
deleted file mode 100644 (file)
index b69baad..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./settings.pro~    2005-09-08 04:01:29.000000000 +0300
-+++ ./settings.pro     2005-09-08 16:21:34.000000000 +0300
-@@ -21,12 +21,12 @@
- DEFINES += HAVE_MMX
- release {
--    QMAKE_CXXFLAGS_RELEASE = -O3 -march=pentiumpro -fomit-frame-pointer
-+    QMAKE_CXXFLAGS_RELEASE += $${ECXXFLAGS}
-     macx {
-         # Don't use -O3, it causes some Qt moc methods to go missing
-         QMAKE_CXXFLAGS_RELEASE = -O2
-     }
--    QMAKE_CFLAGS_RELEASE = $${QMAKE_CXXFLAGS_RELEASE}
-+    QMAKE_CFLAGS_RELEASE = $${ECFLAGS}
- }
- macx {
diff --git a/mythplugins-lib64.patch b/mythplugins-lib64.patch
new file mode 100644 (file)
index 0000000..ce8e9ef
--- /dev/null
@@ -0,0 +1,142 @@
+--- ./configure~       2005-11-04 01:23:51.000000000 +0200
++++ ./configure        2005-11-05 16:18:39.000000000 +0200
+@@ -250,7 +250,7 @@
+         done
+     fi
+-    LIBPATHS="`echo $LIBPATHS $prefix/lib /lib /usr/lib /usr/local/lib /usr/X11R6/lib | sed s/'\/ '/' '/g` "
++    LIBPATHS="`echo $LIBPATHS $prefix/lib64 /lib64 /usr/lib64 /usr/local/lib64 /usr/X11R6/lib64 | sed s/'\/ '/' '/g` "
+     HAS_IT="no"
+     for LIBPATH in $LIBPATHS ; do
+diff -u -r mythplugins-lib32/mythbrowser/mythbookmarkmanager/mythbookmarkmanager.pro mythplugins/mythbrowser/mythbookmarkmanager/mythbookmarkmanager.pro
+--- mythplugins-lib32/mythbrowser/mythbookmarkmanager/mythbookmarkmanager.pro  2005-10-22 13:31:23.000000000 +0300
++++ mythplugins/mythbrowser/mythbookmarkmanager/mythbookmarkmanager.pro        2005-10-22 18:37:31.000000000 +0300
+@@ -7,7 +7,7 @@
+ TEMPLATE = lib
+ CONFIG += plugin thread warn_on debug
+ TARGET = mythbookmarkmanager
+-target.path = $${PREFIX}/lib/mythtv/plugins
++target.path = $${PREFIX}/lib64/mythtv/plugins
+ INSTALLS += target
+ #uifiles.path = $${PREFIX}/share/mythtv/themes/default
+diff -u -r mythplugins-lib32/mythcontrols/mythcontrols/mythcontrols.pro mythplugins/mythcontrols/mythcontrols/mythcontrols.pro
+--- mythplugins-lib32/mythcontrols/mythcontrols/mythcontrols.pro       2005-10-22 13:31:35.000000000 +0300
++++ mythplugins/mythcontrols/mythcontrols/mythcontrols.pro     2005-10-22 18:37:31.000000000 +0300
+@@ -4,7 +4,7 @@
+ TEMPLATE = lib
+ CONFIG += plugin thread
+ TARGET = mythcontrols
+-target.path = $${PREFIX}/lib/mythtv/plugins
++target.path = $${PREFIX}/lib64/mythtv/plugins
+ INSTALLS += target
+ uifiles.path = $${PREFIX}/share/mythtv/themes/default
+diff -u -r mythplugins-lib32/mythdvd/mythdvd/mythdvd.pro mythplugins/mythdvd/mythdvd/mythdvd.pro
+--- mythplugins-lib32/mythdvd/mythdvd/mythdvd.pro      2005-10-22 13:31:14.000000000 +0300
++++ mythplugins/mythdvd/mythdvd/mythdvd.pro    2005-10-22 18:37:31.000000000 +0300
+@@ -9,7 +9,7 @@
+ TEMPLATE = lib
+ CONFIG += plugin thread
+ TARGET = mythdvd
+-target.path = $${PREFIX}/lib/mythtv/plugins
++target.path = $${PREFIX}/lib64/mythtv/plugins
+ INSTALLS += target
+ installfiles.path = $${PREFIX}/share/mythtv
+diff -u -r mythplugins-lib32/mythgallery/mythgallery/mythgallery.pro mythplugins/mythgallery/mythgallery/mythgallery.pro
+--- mythplugins-lib32/mythgallery/mythgallery/mythgallery.pro  2005-10-22 13:31:34.000000000 +0300
++++ mythplugins/mythgallery/mythgallery/mythgallery.pro        2005-10-22 18:37:31.000000000 +0300
+@@ -10,7 +10,7 @@
+ TEMPLATE = lib
+ CONFIG += plugin thread
+ TARGET = mythgallery
+-target.path = $${PREFIX}/lib/mythtv/plugins
++target.path = $${PREFIX}/lib64/mythtv/plugins
+ INSTALLS += target
+ LIBS += -ltiff
+diff -u -r mythplugins-lib32/mythgame/mythgame/mythgame.pro mythplugins/mythgame/mythgame/mythgame.pro
+--- mythplugins-lib32/mythgame/mythgame/mythgame.pro   2005-10-22 13:31:44.000000000 +0300
++++ mythplugins/mythgame/mythgame/mythgame.pro 2005-10-22 18:37:31.000000000 +0300
+@@ -4,7 +4,7 @@
+ TEMPLATE = lib
+ CONFIG += plugin thread
+ TARGET = mythgame
+-target.path = $${PREFIX}/lib/mythtv/plugins
++target.path = $${PREFIX}/lib64/mythtv/plugins
+ INSTALLS += target
+ installfiles.path = $${PREFIX}/share/mythtv
+diff -u -r mythplugins-lib32/mythmusic/mythmusic/mythmusic.pro mythplugins/mythmusic/mythmusic/mythmusic.pro
+--- mythplugins-lib32/mythmusic/mythmusic/mythmusic.pro        2005-10-22 13:31:22.000000000 +0300
++++ mythplugins/mythmusic/mythmusic/mythmusic.pro      2005-10-22 18:37:31.000000000 +0300
+@@ -10,7 +10,7 @@
+ TEMPLATE = lib
+ CONFIG += plugin thread
+ TARGET = mythmusic
+-target.path = $${PREFIX}/lib/mythtv/plugins
++target.path = $${PREFIX}/lib64/mythtv/plugins
+ INSTALLS += target
+ installfiles.path = $${PREFIX}/share/mythtv
+diff -u -r mythplugins-lib32/mythnews/mythnews/mythnews.pro mythplugins/mythnews/mythnews/mythnews.pro
+--- mythplugins-lib32/mythnews/mythnews/mythnews.pro   2005-10-22 13:31:45.000000000 +0300
++++ mythplugins/mythnews/mythnews/mythnews.pro 2005-10-22 18:37:31.000000000 +0300
+@@ -4,7 +4,7 @@
+ TEMPLATE = lib
+ CONFIG += plugin thread warn_on debug
+ TARGET = mythnews
+-target.path = $${PREFIX}/lib/mythtv/plugins
++target.path = $${PREFIX}/lib64/mythtv/plugins
+ INSTALLS += target
+ uifiles.path = $${PREFIX}/share/mythtv/themes/default
+diff -u -r mythplugins-lib32/mythphone/mythphone/mythphone.pro mythplugins/mythphone/mythphone/mythphone.pro
+--- mythplugins-lib32/mythphone/mythphone/mythphone.pro        2005-10-22 13:31:42.000000000 +0300
++++ mythplugins/mythphone/mythphone/mythphone.pro      2005-10-22 18:37:31.000000000 +0300
+@@ -16,7 +16,7 @@
+ TEMPLATE = lib
+ CONFIG += plugin thread
+ TARGET = mythphone
+-target.path = $${PREFIX}/lib/mythtv/plugins
++target.path = $${PREFIX}/lib64/mythtv/plugins
+ INSTALLS += target
+ uifiles.path = $${PREFIX}/share/mythtv/themes/default
+diff -u -r mythplugins-lib32/mythvideo/mythvideo/mythvideo.pro mythplugins/mythvideo/mythvideo/mythvideo.pro
+--- mythplugins-lib32/mythvideo/mythvideo/mythvideo.pro        2005-10-22 13:31:39.000000000 +0300
++++ mythplugins/mythvideo/mythvideo/mythvideo.pro      2005-10-22 18:37:31.000000000 +0300
+@@ -4,7 +4,7 @@
+ TEMPLATE = lib
+ CONFIG += plugin thread
+ TARGET = mythvideo
+-target.path = $${PREFIX}/lib/mythtv/plugins
++target.path = $${PREFIX}/lib64/mythtv/plugins
+ INSTALLS += target
+ uifiles.path = $${PREFIX}/share/mythtv/themes/default
+diff -u -r mythplugins-lib32/mythweather/mythweather/mythweather.pro mythplugins/mythweather/mythweather/mythweather.pro
+--- mythplugins-lib32/mythweather/mythweather/mythweather.pro  2005-10-22 13:31:33.000000000 +0300
++++ mythplugins/mythweather/mythweather/mythweather.pro        2005-10-22 18:37:31.000000000 +0300
+@@ -4,7 +4,7 @@
+ TEMPLATE = lib
+ CONFIG += plugin thread
+ TARGET = mythweather
+-target.path = $${PREFIX}/lib/mythtv/plugins
++target.path = $${PREFIX}/lib64/mythtv/plugins
+ INSTALLS += target
+ uifiles.path = $${PREFIX}/share/mythtv/themes/default
+--- ./mythplugins.libdir/mythflix/mythflix/mythflix.pro        2005-12-21 00:52:42.000000000 +0200
++++ mythplugins/mythflix/mythflix/mythflix.pro 2006-02-02 17:52:35.000000000 +0200
+@@ -4,7 +4,7 @@
+ TEMPLATE = lib
+ CONFIG += plugin thread warn_on debug
+ TARGET = mythflix
+-target.path = $${PREFIX}/lib/mythtv/plugins
++target.path = $${PREFIX}/lib64/mythtv/plugins
+ INSTALLS += target
+ uifiles.path = $${PREFIX}/share/mythtv/themes/default
diff --git a/mythplugins-paths.patch b/mythplugins-paths.patch
new file mode 100644 (file)
index 0000000..5132745
--- /dev/null
@@ -0,0 +1,36 @@
+diff -u -r mythplugins-pre/mythgallery/mythgallery/gallerysettings.cpp mythplugins/mythgallery/mythgallery/gallerysettings.cpp
+--- mythplugins-pre/mythgallery/mythgallery/gallerysettings.cpp        2005-10-22 13:31:34.000000000 +0300
++++ mythplugins/mythgallery/mythgallery/gallerysettings.cpp    2005-10-22 18:39:49.000000000 +0300
+@@ -44,7 +44,7 @@
+ {
+     HostLineEdit *gc = new HostLineEdit("GalleryImportDirs");
+     gc->setLabel(QObject::tr("Paths to import images from"));
+-    gc->setValue("/mnt/cdrom:/mnt/camera");
++    gc->setValue("/media/cdrom:/mnt/camera");
+     gc->setHelpText(QObject::tr("This is a colon separated list of paths. "
+                     "If the path in the list is a directory, its contents will "
+                     "be copied. If it is an executable, it will be run."));
+diff -u -r mythplugins-pre/mythmusic/mythmusic/globalsettings.cpp mythplugins/mythmusic/mythmusic/globalsettings.cpp
+--- mythplugins-pre/mythmusic/mythmusic/globalsettings.cpp     2005-10-22 13:31:22.000000000 +0300
++++ mythplugins/mythmusic/mythmusic/globalsettings.cpp 2005-10-22 18:39:49.000000000 +0300
+@@ -18,7 +18,7 @@
+ {
+     HostLineEdit *gc = new HostLineEdit("MusicLocation");
+     gc->setLabel(QObject::tr("Directory to hold music"));
+-    gc->setValue("/mnt/store/music/");
++    gc->setValue("/var/lib/mythmusic/");
+     gc->setHelpText(QObject::tr("This directory must exist, and the user "
+                     "running MythMusic needs to have write permission "
+                     "to the directory."));
+diff -u -r mythplugins-pre/mythvideo/mythvideo/globalsettings.cpp mythplugins/mythvideo/mythvideo/globalsettings.cpp
+--- mythplugins-pre/mythvideo/mythvideo/globalsettings.cpp     2005-10-22 13:31:39.000000000 +0300
++++ mythplugins/mythvideo/mythvideo/globalsettings.cpp 2005-10-22 18:39:49.000000000 +0300
+@@ -159,7 +159,7 @@
+ {
+     HostLineEdit *gc = new HostLineEdit("VideoStartupDir");
+     gc->setLabel(QObject::tr("Directory that holds videos"));
+-    gc->setValue("/share/Movies/dvd");
++    gc->setValue("/var/lib/mythvideo");
+     gc->setHelpText(QObject::tr("This directory must exist, and the user "
+                     "running MythVideo only needs to have read permission "
+                     "to the directory."));
index 318906d9efe40991f919e1b56569a20b8a2d194e..5719a0734f24a948af500870a18c5b2e04d0b563 100644 (file)
@@ -1,15 +1,3 @@
-diff -ur ./mythweb/canned_searches.php /tmp/mythweb/canned_searches.php
---- ./mythweb/canned_searches.php      2005-03-01 09:10:23.000000000 +0200
-+++ /tmp/mythweb/canned_searches.php   2005-10-26 00:17:02.000000000 +0300
-@@ -13,7 +13,7 @@
-     require_once "includes/init.php";
- // Load the canned searches
--    require_once "config/canned_searches.php";
-+    require_once "/etc/mythweb/canned_searches.php";
- // Load the class for this page
-     require_once theme_dir.'canned_searches.php';
 diff -ur ./mythweb/includes/init.php /tmp/mythweb/includes/init.php
 --- ./mythweb/includes/init.php        2005-02-28 00:52:48.000000000 +0200
 +++ /tmp/mythweb/includes/init.php     2005-10-26 00:11:25.000000000 +0300
@@ -18,82 +6,76 @@ diff -ur ./mythweb/includes/init.php /tmp/mythweb/includes/init.php
  
  // Load the user-defined configuration settings
 -    require_once 'config/conf.php';
-+    require_once '/etc/mythweb/conf.php';
++    require_once '/etc/webapps/mythweb/conf.php';
  
  // Clean up some variables
      if (!ereg('/$', $_SERVER['DOCUMENT_ROOT']))
-@@ -127,15 +127,15 @@
-     define('theme_dir', 'themes/'.Theme.'/');
+--- ./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@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));
  
- // Load the theme config
--    require_once 'config/theme_'.Theme.'.php';
-+    require_once '/etc/mythweb/theme_'.Theme.'.php';
- // Load the overall page theme class
-     require_once theme_dir."theme.php";
+ // For the "movies" search -- set this to the word your listings provider uses to
+ //   describe movies/films/peliculas/etc.
+--- /mythweb/includes/mythbackend.php~ 2005-10-22 13:31:12.000000000 +0300
++++ /mythweb/includes/mythbackend.php  2005-11-04 23:31:31.707600269 +0200
+@@ -335,7 +335,7 @@
+             // Make sure the local path exists
+                 $path = '';
+                 foreach (split('/+', dirname($pngpath)) as $dir) {
+-                    $path .= $path ? '/' . $dir : $dir;
++                                      $path .= $path ? ('/' . $dir) : ($dir ? $dir : "/$dir");
+                     if(!is_dir($path) && !mkdir($path, 0755))
+                         trigger_error('Error creating path for '.$path.': Please check permissions.', FATAL);
+                 }
+--- ./mythweb/includes/init.php        2006-01-07 02:10:47.000000000 +0200
++++ /tmp/init.php      2006-01-08 01:02:40.000000000 +0200
+@@ -232,12 +232,12 @@
+     define('theme_url', root.theme_dir);
  
- // Make sure the image cache path exists
-     $path = '';
--    foreach (split('/+', image_cache) as $dir) {
--        $path .= $path ? '/' . $dir : $dir;
-+    foreach (split("/+", image_cache) as $dir) {
-+        $path .= $path ? ('/' . $dir) : ($dir ? $dir : "/$dir");
-         if(!is_dir($path) && !mkdir($path, 0755))
-             trigger_error('Error creating path for '.$path.': Please check permissions.', FATAL);
+ // Make sure the data directory exists and is writable
+-    if (!is_dir('data') && !mkdir('data', 0755)) {
++    if (!is_dir('/var/cache/mythweb') && !mkdir('/var/cache/mythweb', 0755)) {
+         $Error = 'Error creating the data directory. Please check permissions.';
+         require_once 'templates/_error.php';
+         exit;
+     }
+-    if (!is_writable('data')) {
++    if (!is_writable('/var/cache/mythweb')) {
+         $process_user = posix_getpwuid(posix_geteuid());
+         $Error = 'data directory is not writable by '.$process_user['name'].'. Please check permissions.';
+         require_once 'templates/_error.php';
+@@ -245,7 +245,7 @@
      }
-diff -ur ./mythweb/search.php /tmp/mythweb/search.php
---- ./mythweb/search.php       2005-03-01 09:10:23.000000000 +0200
-+++ /tmp/mythweb/search.php    2005-10-26 00:17:12.000000000 +0300
-@@ -64,7 +64,7 @@
-     if (preg_match('/^\s*canned:\s*(.+)\s*$/', $_SESSION['search']['searchstr'], $search_name)) {
-         $search_name = $search_name[1];
-     // Load the canned searches
--        require_once 'config/canned_searches.php';
-+        require_once '/etc/mythweb/canned_searches.php';
-     // Find the query
-         if ($Canned_Searches[$search_name]) {
-             $query = array($Canned_Searches[$search_name]);
-diff -ur ./mythweb/weather.php /tmp/mythweb/weather.php
---- ./mythweb/weather.php      2005-03-09 08:41:54.000000000 +0200
-+++ /tmp/mythweb/weather.php   2005-10-26 00:17:22.000000000 +0300
-@@ -253,7 +253,7 @@
- }
- function getImageAndDescFromId($myid) {
--    $data = file("config/weathertypes.dat");
-+    $data = file("/etc/mythweb/weathertypes.dat");
-     foreach($data as $line) {
-     list($id, $name, $img) = explode(",", $line);
-     if($id != $myid) continue;
-@@ -263,7 +263,7 @@
- }
- function getImageFromName($myname) {
--    $data = file("config/weathertypes.dat");
-+    $data = file("/etc/mythweb/weathertypes.dat");
-     foreach($data as $line) {
-     list($id, $name, $img) = explode(",", $line);
-     if($name != $myname) continue;
-diff -u ./mythweb/config/conf.php /tmp/conf/conf.php
---- ./mythweb/config/conf.php  2005-01-31 07:42:41.000000000 +0200
-+++ /tmp/conf/conf.php 2005-10-26 00:15:19.000000000 +0300
-@@ -41,7 +41,7 @@
-     define('fs_encoding', 'ISO-8859-1');
- // Path to the image cache directory
--    define('image_cache', 'image_cache');
-+    define('image_cache', '/var/cache/mythweb/image_cache');
  
- // 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']);
+ // New hard-coded cache directory
+-    define('cache_dir', 'data/cache');
++    define('cache_dir', '/var/cache/mythweb');
  
- // Email address to which php and database errors are mailed to
--    define('Error_Email', 'php_errors@'.preg_replace('/.*?\b([\w\-]+\.[\w\-]+)$/', '$1', server_domain));
-+    define('Error_Email', 'root@'.preg_replace('/.*?\b([\w\-]+\.[\w\-]+)$/', '$1', server_domain));
+ // Make sure the image cache path exists and is writable
+     if (!is_dir(cache_dir) && !mkdir(cache_dir, 0755)) {
+--- ./mythweb/modules/tv/handler.php   2006-02-01 21:18:41.000000000 +0200
++++ ./modules/tv/handler.php   2006-02-01 21:18:43.170715902 +0200
+@@ -14,14 +14,14 @@
+ /**/
  
- // For the "movies" search -- set this to the word your listings provider uses to
- //   describe movies/films/peliculas/etc.
+ // Make sure the image cache path exists and is writable
+-    if (!is_dir('data/tv_icons') && !mkdir('data/tv_icons', 0755)) {
+-        $Error = 'Error creating data/tv_icons: Please check permissions on the data directory.';
++    if (!is_dir('/var/cache/mythweb/tv_icons') && !mkdir('/var/cache/mythweb/tv_icons', 0755)) {
++        $Error = 'Error creating /var/cache/mythweb/tv_icons: Please check permissions on the data directory.';
+         require_once 'templates/_error.php';
+         exit;
+     }
+-    if (!is_writable('data/tv_icons')) {
++    if (!is_writable('/var/cache/mythweb/tv_icons')) {
+         $process_user = posix_getpwuid(posix_geteuid());
+-        $Error = 'data/tv_icons directory is not writable by '.$process_user['name'].'. Please check permissions.';
++        $Error = '/var/cache/mythweb/tv_icons directory is not writable by '.$process_user['name'].'. Please check permissions.';
+         require_once 'templates/_error.php';
+         exit;
+     }
index 4032a17cec7b1b6d95337e8cf41d3ccb204c860a..d3aa60cb658f491818e9c4f2285b378d70efd00a 100644 (file)
@@ -1,31 +1,58 @@
 # $Id$
 
+# Apache config for MythWeb.
+# See http://www.mythtv.org/ for information about MythTV itself.
+
+# 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
+
+Alias /mythweb/image_cache /var/cache/mythweb/image_cache
+<Directory /var/cache/mythweb/image_cache>
+       AuthType Basic
+       AuthName "MythTV"
+       AuthUserFile /etc/mythweb/htpasswd
+       Require valid-user
+       Allow from all
+</Directory>
+
 Alias /mythweb /usr/share/mythweb
 <Directory /usr/share/mythweb>
-
-<IfModule !mod_auth.c>
-    deny from all
-    allow from localhost
-</IfModule>
-<IfModule mod_auth.c>
     AuthType Basic
     AuthName "MythTV"
     AuthUserFile /etc/mythweb/htpasswd
     Require valid-user
-    allow from all
+    Allow from all
+
+# 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.  Make sure you have mod_env enabled.
+    #
+<IfModule mod_env.c>
+    SetEnv db_server        "localhost"
+    SetEnv db_name          "mythconverg"
+    SetEnv db_login         "mythtv"
+    SetEnv db_password      "mythtv"
 </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
+    # By default, php will always search the current directory for include files,
+    # but if you wish to install these directories outside of the current path
+    # (eg. for security reasons), set this variable to the directory that
+    # contains the directories like languages and templates.  eg.
+    #
+    #   setenv include_path      "/usr/share/mythweb"
+
+    #  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.
 
-# 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.
-<FilesMatch "\.php$">
     php_value safe_mode                     0
 
     php_value memory_limit                  32M
@@ -50,9 +77,34 @@ Alias /mythweb /usr/share/mythweb
 # php_flag does not work in older versions of php
     php_flag output_handler                 "NULL"
     php_flag short_open_tag                 "On"
-
 </FilesMatch>
 
+#
+# 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
+    RewriteBase    /mythweb/
+
+# Skip out early if we've already been through rewrites,
+# or if this is a /css/, /js/ or /cache/ directory request.
+    RewriteRule    ^(css|data|images|js|themes|skins|[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]
+    RewriteRule     ^(.*)$                  mythweb.php                 [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>
+
 </Directory>
 
-# vim: filetype=apache ts=4 sw=4 et
+# vim: filetype=apache
This page took 0.096674 seconds and 4 git commands to generate.