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

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

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

Revision 1.1 - (show annotations) (download)
Fri Jun 4 06:29:05 2021 UTC (3 years, 5 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-madsonic-5_0_3761-4_el7_sme 
* Fri Jun 04 2021 Jean-Philippe Pialasse <tests@pialasse.com> 5.0.3761-4.sme
- fix new configuration for madsonic 6 [SME: 11280]
  add update event
- add madsonic user to audio group [SME: 10700]
- add /var/media folders and subfolders [SME: 10701]
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 2013-11-20 23:56:31.000000000 -0500
3 +++ smeserver-madsonic-5.0.3761/createlinks 2021-06-04 02:25:02.820000000 -0400
4 @@ -18,3 +18,10 @@
5 service_link_enhanced("madsonic", "K45", "6");
6 service_link_enhanced("madsonic", "K45", "0");
7 service_link_enhanced("madsonic", "K45", "1");
8 +
9 +my $event= "smeserver-madsonic-update";
10 + safe_symlink("restart", "root/etc/e-smith/$event/conf-madsonic/services2adjust/madsonic");
11 + safe_symlink("restart", "root/etc/e-smith/$event/conf-madsonic/services2adjust/httpd-e-smith");
12 + templates2events( "/etc/sysconfig/madsonic" , $event);
13 + templates2events( "/etc/httpd/conf/httpd.conf" , $event);
14 +
15 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
16 --- smeserver-madsonic-5.0.3761.old/root/etc/e-smith/templates/etc/sysconfig/madsonic/40madsonic 2013-11-20 23:11:58.000000000 -0500
17 +++ smeserver-madsonic-5.0.3761/root/etc/e-smith/templates/etc/sysconfig/madsonic/40madsonic 2021-06-04 01:15:48.746000000 -0400
18 @@ -3,19 +3,20 @@
19 # (/etc/init.d/madsonic)
20 #
21 # To change the startup parameters of Madsonic, modify
22 -# the SUBSONIC_ARGS variable below.
23 +# the MADSONIC_ARGS variable below.
24 #
25 -# Type "madsonic --help" on the command line to read an
26 +# Type "/usr/share/madsonic/madsonic.sh --help" on the command line to read an
27 # explanation of the different options.
28 #
29 # For example, to specify that Madsonic should use port 80 (for http)
30 -# and 443 (for https), and use a Java memory heap size of 350 MB, use
31 -# the following:
32 +# and 443 (for https), and use a Java init memory heap size of 192 MB,
33 +# and use a Java max memory heap size of 384 MB
34 +# use the following:
35 #
36 -# SUBSONIC_ARGS="--port=80 --https-port=443 --max-memory=350"
37 +# MADSONIC_ARGS="--port=80 --https-port=443 --init-memory=192 --max-memory=384"
38
39
40 -SUBSONIC_ARGS="{
41 +MADSONIC_ARGS="{
42 my $madhome = $madsonic{'home'} || "/var/madsonic";
43 my $madhost = $madsonic{'host'} || "0.0.0.0";
44 my $madport = $madsonic{'port'} || "4041";
45 @@ -24,10 +25,13 @@
46 my $madinitmem = $madsonic{'InitMemory'} || "200";
47 my $madmem = $madsonic{'MaxMemory'} || "350";
48 my $madpid = $madsonic{'PIDfile'} || "";
49 -my $madmusic = $madsonic{'Music_Folder'} || "/var/music";
50 -my $madpod = $madsonic{'Podcast_Folder'} || "/var/music/Podcast";
51 -my $madplay = $madsonic{'Playlist_Folder'} || "/var/music/playlists";
52 -my $madquiet = $madsonic{'quiet'} || "0";
53 +my $madmusic = $madsonic{'Music_Folder'} || "/var/media";
54 +my $madpod = $madsonic{'Podcast_Folder'} || "/var/media/podcast";
55 +my $madplay = $madsonic{'Playlist_Folder'} || "/var/media/playlists";
56 +my $madinco = $madsonic{'Inco_Folder'} || "/var/media/incoming";
57 +my $madimpo = $madsonic{'Impo_Folder'} || "/var/media/playlists/import";
58 +my $madexpo = $madsonic{'Expo_Folder'} || "/var/media/playlists/export";
59 +my $madback = $madsonic{'Back_Folder'} || "/var/media/playlists/backup";
60
61
62 $OUT .= "--max-memory=$madmem --context-path='$madpath'";
63 @@ -37,10 +41,12 @@
64 $OUT .= " --port='$madport'" unless $madport == "4040";
65 $OUT .= " --https-port='$madhttps_port'" unless $madhttps_port eq "0";
66 $OUT .= " --pidfile='$madpid'" unless $madpid eq "";
67 -$OUT .= " --quiet" unless $madquiet eq "0";
68 -$OUT .= " --default-music-folder='$madmusic'" unless $madmusic eq "/var/music";
69 -$OUT .= " --default-podcast-folder='$madpod'" unless $madpod eq "/var/music/Podcast";
70 -$OUT .= " --default-playlist-folder='$madplay'" unless $madplay eq "/var/music/playlists";
71 +$OUT .= " --default-music-folder='$madmusic'" unless $madmusic eq "/var/media";
72 +$OUT .= " --default-podcast-folder='$madpod'" unless $madpod eq "/var/media/podcast";
73 +$OUT .= " --default-playlist-folder='$madplay'" unless $madplay eq "/var/media/playlists";
74 +$OUT .= " --default-playlist-import-folder='$madimpo'" unless $madimpo eq "/var/media/playlists/import";
75 +$OUT .= " --default-playlist-export-folder='$madexpo'" unless $madexpo eq "/var/media/playlists/export";
76 +$OUT .= " --default-playlist-backup-folder='$madback'" unless $madback eq "/var/media/playlists/backup";
77 $OUT .= " --init-memory=$madinitmem";
78 $OUT .= " --max-memory=$madmem";
79 }"
80 @@ -51,5 +57,5 @@
81 # below 1024. Also make sure to grant the user write permissions in
82 # the music directories, otherwise changing album art and tags will fail.
83
84 -SUBSONIC_USER=madsonic
85 +MADSONIC_USER=madsonic
86
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed