/[smecontribs]/rpms/smeserver-mediatomb/contribs9/smeserver-mediatomb-1.0-templates_fixes.patch
ViewVC logotype

Annotation of /rpms/smeserver-mediatomb/contribs9/smeserver-mediatomb-1.0-templates_fixes.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (hide annotations) (download)
Tue Mar 20 13:29:46 2018 UTC (6 years, 8 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-mediatomb-1_0-12_el6_sme, smeserver-mediatomb-1_0-9_el6_sme, smeserver-mediatomb-1_0-11_el6_sme, smeserver-mediatomb-1_0-7_el6_sme, smeserver-mediatomb-1_0-6_el6_sme, smeserver-mediatomb-1_0-5_el6_sme, smeserver-mediatomb-1_0-10_el6_sme, smeserver-mediatomb-1_0-3_el6_sme, smeserver-mediatomb-1_0-4_el6_sme, smeserver-mediatomb-1_0-13_el6_sme, smeserver-mediatomb-1_0-8_el6_sme, HEAD 
* Tue Mar 20 2018 Jean-Philipe Pialasse <tests@pialasse.com> 1.0-3.sme
- fix few templates issues
1 jpp 1.1 diff -Nur smeserver-mediatomb-1.0.old/root/etc/e-smith/templates/etc/mediatomb/config.xml/101server smeserver-mediatomb-1.0/root/etc/e-smith/templates/etc/mediatomb/config.xml/101server
2     --- smeserver-mediatomb-1.0.old/root/etc/e-smith/templates/etc/mediatomb/config.xml/101server 2018-03-18 23:37:57.000000000 -0400
3     +++ smeserver-mediatomb-1.0/root/etc/e-smith/templates/etc/mediatomb/config.xml/101server 2018-03-20 09:27:41.405000000 -0400
4     @@ -1,8 +1,8 @@
5     <server>
6     {
7     -my $ui= ( ${'mediatomb'}{'UIstatus'} eq 'no' ) ? 'no' : 'yes';
8     -my $tooltips= ( ${'mediatomb'}{'UItooltips'} eq 'no' ) ? 'no' : 'yes';
9     -my $uiaccounts= ( ${'mediatomb'}{'UIaccounts'} eq 'no' ) ? 'no' : 'yes';
10     +my $ui= ( ( ${'mediatomb'}{'UIstatus'} || '' ) eq 'no' ) ? 'no' : 'yes';
11     +my $tooltips= ( ( ${'mediatomb'}{'UItooltips'} || '' ) eq 'no' ) ? 'no' : 'yes';
12     +my $uiaccounts= ( ( ${'mediatomb'}{'UIaccounts'} || '' ) eq 'no' ) ? 'no' : 'yes';
13     my $user= ${'mediatomb'}{'UIuser'} || 'mediatomb';
14     my $pass= ${'mediatomb'}{'UIpass'} || 'mediatomb';
15    
16     diff -Nur smeserver-mediatomb-1.0.old/root/etc/e-smith/templates/etc/mediatomb/config.xml/14db smeserver-mediatomb-1.0/root/etc/e-smith/templates/etc/mediatomb/config.xml/14db
17     --- smeserver-mediatomb-1.0.old/root/etc/e-smith/templates/etc/mediatomb/config.xml/14db 2018-03-19 00:25:49.000000000 -0400
18     +++ smeserver-mediatomb-1.0/root/etc/e-smith/templates/etc/mediatomb/config.xml/14db 2018-03-20 09:21:03.894000000 -0400
19     @@ -1,8 +1,8 @@
20     {
21     -my $dbtype = ( ${'mediatomb'}{'DBtype'} eq 'sqlite' ) ? 'sqlite' : 'mysql';
22     +my $dbtype = ( ( ${'mediatomb'}{'DBtype'} || '' ) eq 'sqlite' ) ? 'sqlite' : 'mysql';
23     my $dbname = ${'mediatomb'}{'DBName'} || 'mediatomb';
24     my $dbuser = ${'mediatomb'}{'DBUser'} || 'mediatomb';
25     -my $pass = ${'mediatomb'}{'DBpass'} || '';
26     +my $pass = ${'mediatomb'}{'DBPassword'} || '';
27     my $sqlite = 'no';
28     my $mysql = 'yes';
29     if ($dbtype ne 'mysql' || $pass eq '' )
30     @@ -23,4 +23,4 @@
31     </mysql>
32     </storage>\n";
33    
34     -}
35     \ Pas de fin de ligne à la fin du fichier
36     +}
37     diff -Nur smeserver-mediatomb-1.0.old/root/etc/e-smith/templates/etc/mediatomb/config.xml/74vlcmpeg smeserver-mediatomb-1.0/root/etc/e-smith/templates/etc/mediatomb/config.xml/74vlcmpeg
38     --- smeserver-mediatomb-1.0.old/root/etc/e-smith/templates/etc/mediatomb/config.xml/74vlcmpeg 2018-03-18 06:34:55.000000000 -0400
39     +++ smeserver-mediatomb-1.0/root/etc/e-smith/templates/etc/mediatomb/config.xml/74vlcmpeg 2018-03-20 09:14:58.967000000 -0400
40     @@ -3,6 +3,6 @@
41     <accept-url>yes</accept-url>
42     <first-resource>yes</first-resource>
43     <accept-ogg-theora>yes</accept-ogg-theora>
44     - <agent command="vlc" arguments="-I dummy %in --sout #transcode{venc=ffmpeg,vcodec=mp2v,vb=4096,fps=25,aenc=ffmpeg,acodec=mpga,ab=192,samplerate=44100,channels=2}:standard{access=file,mux=ps,dst=%out} vlc:quit"/>
45     + <agent command="vlc" arguments="-I dummy %in --sout #transcode\{venc=ffmpeg,vcodec=mp2v,vb=4096,fps=25,aenc=ffmpeg,acodec=mpga,ab=192,samplerate=44100,channels=2\}:standard\{access=file,mux=ps,dst=%out\} vlc:quit"/>
46     <buffer size="14400000" chunk-size="512000" fill-size="120000"/>
47     </profile>
48     diff -Nur smeserver-mediatomb-1.0.old/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/80mediatomb smeserver-mediatomb-1.0/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/80mediatomb
49     --- smeserver-mediatomb-1.0.old/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/80mediatomb 1969-12-31 19:00:00.000000000 -0500
50     +++ smeserver-mediatomb-1.0/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/80mediatomb 2018-03-20 08:56:38.623000000 -0400
51     @@ -0,0 +1 @@
52     +PERMS=0750
53     diff -Nur smeserver-mediatomb-1.0.old/root/etc/e-smith/templates.metadata/etc/mediatomb/config.xml smeserver-mediatomb-1.0/root/etc/e-smith/templates.metadata/etc/mediatomb/config.xml
54     --- smeserver-mediatomb-1.0.old/root/etc/e-smith/templates.metadata/etc/mediatomb/config.xml 2018-03-18 05:59:36.000000000 -0400
55     +++ smeserver-mediatomb-1.0/root/etc/e-smith/templates.metadata/etc/mediatomb/config.xml 2018-03-20 09:18:11.832000000 -0400
56     @@ -1,3 +1,3 @@
57     -UID=mediatomb
58     -GID=mediatomb
59     +UID="mediatomb"
60     +GID="mediatomb"
61     PERMS=0750
62     \ Pas de fin de ligne à la fin du fichier
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed