Merge branch 'testing'

1 files changed, 13 insertions, 12 deletions

diff --git a/abs/core/mythdb-initial/custom.sql b/abs/core/mythdb-initial/custom.sql
index 72a94f4..99a0452 100644
--- a/abs/core/mythdb-initial/custom.sql
+++ b/abs/core/mythdb-initial/custom.sql
@@ -45,6 +45,7 @@ INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES
  ('HaltCommand'           ,'sudo /sbin/halt'               , 'apheleia'),
  ('RebootCommand'         ,'sudo /sbin/reboot'             , 'apheleia'),
  ('Theme'                 ,'LinHES'                        , 'apheleia'),
+ ('ThemePainter'          ,'auto'                          , 'apheleia'),
  ('LircSocket'            ,'/var/run/lirc/lircd'           , 'apheleia');
 --
 
@@ -75,13 +76,13 @@ INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES
 -- MythVideo old local dir..replaced by storage groups
 /*
 INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES
- ('ScreenShotPath'              ,'/myth/video_stuff/screenshots'  , 'apheleia'),
+ ('ScreenShotPath'              ,'/myth/artwork/screenshots'  , 'apheleia'),
  ('VideoStartupDir'             ,'/myth/video'                    , 'apheleia'),
- ('mythvideo.TrailersDir'       ,'/myth/video_stuff/trailers'     , 'apheleia'),
- ('VideoArtworkDir'             ,'/myth/video_stuff/coverart'     , 'apheleia'),
- ('mythvideo.screenshotDir'     ,'/myth/video_stuff/screenshots'  , 'apheleia'),
- ('mythvideo.bannerDir'         ,'/myth/video_stuff/banners'      , 'apheleia'),
- ('mythvideo.fanartDir'         ,'/myth/video_stuff/fanart'       , 'apheleia');
+ ('mythvideo.TrailersDir'       ,'/myth/artwork/trailers'     , 'apheleia'),
+ ('VideoArtworkDir'             ,'/myth/artwork/coverart'     , 'apheleia'),
+ ('mythvideo.screenshotDir'     ,'/myth/artwork/screenshots'  , 'apheleia'),
+ ('mythvideo.bannerDir'         ,'/myth/artwork/banners'      , 'apheleia'),
+ ('mythvideo.fanartDir'         ,'/myth/artwork/fanart'       , 'apheleia');
 */
 
 
@@ -89,12 +90,12 @@ INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES
 INSERT INTO `storagegroup` (`groupname`, `hostname`, `dirname`) VALUES
 --  ('Default'     ,'apheleia'    ,'/myth/tv/'),
 --  ('LiveTV'      ,'apheleia'    ,'/myth/tv/live/'),
---  ('Screenshots' ,'apheleia'    ,'/myth/video_stuff/screenshots/'),
+--  ('Screenshots' ,'apheleia'    ,'/myth/artwork/screenshots/'),
 --  ('Videos'      ,'apheleia'    ,'/myth/video/'),
---  ('Coverart'    ,'apheleia'    ,'/myth/video_stuff/coverart/'),
---  ('Banners'     ,'apheleia'    ,'/myth/video_stuff/banners/'),
---  ('Fanart'      ,'apheleia'    ,'/myth/video_stuff/fanart/'),
---  ('Trailers'    ,'apheleia'    ,'/myth/video_stuff/trailers/'),
+--  ('Coverart'    ,'apheleia'    ,'/myth/artwork/coverart/'),
+--  ('Banners'     ,'apheleia'    ,'/myth/artwork/banners/'),
+--  ('Fanart'      ,'apheleia'    ,'/myth/artwork/fanart/'),
+--  ('Trailers'    ,'apheleia'    ,'/myth/artwork/trailers/'),
 --  ('Streaming'   ,'apheleia'    ,'/myth/streaming'),
  ('DB Backups'  ,'apheleia'    ,'/data/storage/disk0/backup/mythtv_backups');
 
@@ -149,7 +150,7 @@ INSERT INTO `settings` (`value`, `data`, `hostname`) VALUES
 ('HOSTOSsize',      '5'    ,   'apheleia'),
 ('HOSTrootfstype',  'ext3' ,   'apheleia'),
 ('HOSTHOMEsize',    '3'    ,   'apheleia'),
-('HOSTDatabasesize','5'    ,   'apheleia'),
+('HOSTDatabasesize','2'    ,   'apheleia'),
 ('HostUseSWAP',     '1'    ,   'apheleia'),
 ('HostUseALLdata',  '1'    ,   'apheleia'),
 ('HOSTdatafstype',  'xfs'  ,   'apheleia');