/[smecontribs]/rpms/smeserver-madsonic/contribs10/smeserver-madsonic-5.0.3761-bz12239.patch
ViewVC logotype

Contents of /rpms/smeserver-madsonic/contribs10/smeserver-madsonic-5.0.3761-bz12239.patch

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


Revision 1.1 - (show annotations) (download)
Wed Nov 23 06:53:11 2022 UTC (23 months, 1 week ago) by jpp
Branch: MAIN
CVS Tags: smeserver-madsonic-5_0_3761-8_el7_sme, smeserver-madsonic-5_0_3761-9_el7_sme, HEAD
* Tue Nov 22 2022 Jean-Philippe Pialasse <tests@pialasse.com> 5.0.3761-8.sme
- remove remaining sysvinit files [SME: 12239]
- fix few minors issues, typo and cosmetics

1 diff -Nur --no-dereference smeserver-madsonic-5.0.3761.old/createlinks smeserver-madsonic-5.0.3761/createlinks
2 --- smeserver-madsonic-5.0.3761.old/createlinks 2022-11-22 15:56:59.332000000 -0500
3 +++ smeserver-madsonic-5.0.3761/createlinks 2022-11-22 22:32:31.350000000 -0500
4 @@ -13,17 +13,14 @@
5 safe_symlink("restart", "root/etc/e-smith/events/conf-madsonic/services2adjust/madsonic");
6 safe_symlink("restart", "root/etc/e-smith/events/conf-madsonic/services2adjust/httpd-e-smith");
7
8 -# links for rc.d from init.d
9 - service_link_enhanced("madsonic", "S98", "7");
10 - service_link_enhanced("madsonic", "K45", "6");
11 - service_link_enhanced("madsonic", "K45", "0");
12 - service_link_enhanced("madsonic", "K45", "1");
13 -
14 my $event= "smeserver-madsonic-update";
15 safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/madsonic");
16 safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
17 + safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/rsyslog");
18 templates2events( "/etc/sysconfig/madsonic" , $event);
19 templates2events( "/etc/httpd/conf/httpd.conf" , $event);
20 + templates2events( "/etc/rsyslog.conf" , $event);
21 + event_actions( $event, "madsonic-fixperms" => "05");
22
23 use esmith::Build::Backup qw(:all);
24 backup_includes("smeserver-madsonic", qw(
25 diff -Nur --no-dereference smeserver-madsonic-5.0.3761.old/root/etc/e-smith/events/actions/madsonic-fixperms smeserver-madsonic-5.0.3761/root/etc/e-smith/events/actions/madsonic-fixperms
26 --- smeserver-madsonic-5.0.3761.old/root/etc/e-smith/events/actions/madsonic-fixperms 1969-12-31 19:00:00.000000000 -0500
27 +++ smeserver-madsonic-5.0.3761/root/etc/e-smith/events/actions/madsonic-fixperms 2022-11-23 00:20:43.302000000 -0500
28 @@ -0,0 +1,5 @@
29 +#!/bin/bash
30 +
31 +chown madsonic:madsonic -R /var/media
32 +chown madsonic:madsonic -R /var/madsonic/*
33 +chown madsonic:root /var/madsonic/madsonic.properties /var/madsonic/madsonic.log
34 diff -Nur --no-dereference smeserver-madsonic-5.0.3761.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/99madsonic smeserver-madsonic-5.0.3761/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/99madsonic
35 --- smeserver-madsonic-5.0.3761.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/99madsonic 2022-11-22 15:56:59.335000000 -0500
36 +++ smeserver-madsonic-5.0.3761/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/99madsonic 2022-11-22 23:04:18.488000000 -0500
37 @@ -7,6 +7,7 @@
38
39 Alias /backend/validateLicense.view /var/www/backend/validateLicense.view
40 Alias /backend/validateLicenseKey.view /var/www/backend/validateLicense.view
41 + Alias /backend/version.view /var/www/backend/validateLicense.view
42 <Directory /var/www/backend >
43 AddType text/plain .view
44 order allow,deny
45 @@ -22,6 +23,7 @@
46 Alias /backend/redirect/register.view /var/www/backend/validateLicense.view
47 Alias /backend/redirect/unregister.view /var/www/backend/validateLicense.view
48 Alias /backend/redirect/test.view /var/www/backend/validateLicense.view
49 + Alias /backend/version.view /var/www/backend/validateLicense.view
50 </VirtualHost>
51 <Directory /var/www/backend >
52 AddType text/plain .view
53 diff -Nur --no-dereference smeserver-madsonic-5.0.3761.old/root/etc/e-smith/templates/etc/rsyslog.conf/32madsonic smeserver-madsonic-5.0.3761/root/etc/e-smith/templates/etc/rsyslog.conf/32madsonic
54 --- smeserver-madsonic-5.0.3761.old/root/etc/e-smith/templates/etc/rsyslog.conf/32madsonic 1969-12-31 19:00:00.000000000 -0500
55 +++ smeserver-madsonic-5.0.3761/root/etc/e-smith/templates/etc/rsyslog.conf/32madsonic 2022-11-22 16:00:36.011000000 -0500
56 @@ -0,0 +1,3 @@
57 +# we do not log the service unit content outside of journald
58 +#to see actual madsonic log see /var/madsonic/madsonic.log and /var/madsonic/madsonic_sh.log
59 +:programname, isequal, "madsonic" ~
60 diff -Nur --no-dereference smeserver-madsonic-5.0.3761.old/root/etc/e-smith/templates/etc/sysconfig/madsonic/40madsonic smeserver-madsonic-5.0.3761/root/etc/e-smith/templates/etc/sysconfig/madsonic/40madsonic
61 --- smeserver-madsonic-5.0.3761.old/root/etc/e-smith/templates/etc/sysconfig/madsonic/40madsonic 2022-11-22 15:56:59.335000000 -0500
62 +++ smeserver-madsonic-5.0.3761/root/etc/e-smith/templates/etc/sysconfig/madsonic/40madsonic 2022-11-22 15:58:25.231000000 -0500
63 @@ -33,7 +33,7 @@
64 $madback = $madsonic{'Back_Folder'} || "/var/media/playlists/backup";
65 $madtest = $madsonic{'TestMode'} || "false";
66 $madgzip = $madsonic{'gzip'} || "true";
67 -$madtrans = $madsonic{'TranscodeFolder'} || "";
68 +$madtrans = $madsonic{'TranscodeFolder'} || "/var/madsonic/transcode";
69 use DateTime::TimeZone;
70 $madtz= $madsonic{"timezone"} || DateTime::TimeZone->new( name => 'local' )->name();
71

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed