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

Annotation of /rpms/smeserver-madsonic/contribs10/smeserver-madsonic-5.0.3761-to62.patch

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

Revision 1.1 - (hide annotations) (download)
Sat Jul 23 21:12:25 2022 UTC (2 years, 4 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-madsonic-5_0_3761-6_el7_sme, smeserver-madsonic-5_0_3761-8_el7_sme, smeserver-madsonic-5_0_3761-7_el7_sme, smeserver-madsonic-5_0_3761-9_el7_sme, HEAD 
* Fri Jul 22 2022 Jean-Philippe Pialasse <tests@pialasse.com> 5.0.3761-6.sme
- add to core backup [SME: 12014]
- update for 6.2 neededing java-1.8.0
- add local test webservices
- main rpm is now using systemd [SME: 11619]
1 jpp 1.1 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
2     --- smeserver-madsonic-5.0.3761.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/99madsonic 1969-12-31 19:00:00.000000000 -0500
3     +++ smeserver-madsonic-5.0.3761/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/99madsonic 2022-07-23 17:05:49.917000000 -0400
4     @@ -0,0 +1,32 @@
5     +# needed local webserver to alow madsonic.test configuration
6     +Listen 127.0.0.1:8082
7     +<VirtualHost 127.0.0.1:8082>
8     + ServerName www.madsonic.org
9     + ServerAlias madsonic.org beta.madsonic.org
10     + DocumentRoot /var/www/backend/
11     +
12     + Alias /backend/validateLicense.view /var/www/backend/validateLicense.view
13     + Alias /backend/validateLicenseKey.view /var/www/backend/validateLicense.view
14     + <Directory /var/www/backend >
15     + AddType text/plain .view
16     + order allow,deny
17     + allow from all
18     + Require all granted
19     + </Directory>
20     +</VirtualHost>
21     +Listen 127.0.0.1:8090
22     +<VirtualHost 127.0.0.1:8090>
23     + ServerName www.madsonic.org
24     + ServerAlias madsonic.org beta.madsonic.org
25     + DocumentRoot /var/www/backend/
26     + Alias /backend/redirect/register.view /var/www/backend/validateLicense.view
27     + Alias /backend/redirect/unregister.view /var/www/backend/validateLicense.view
28     + Alias /backend/redirect/test.view /var/www/backend/validateLicense.view
29     +</VirtualHost>
30     + <Directory /var/www/backend >
31     + AddType text/plain .view
32     + order allow,deny
33     + allow from all
34     + Require all granted
35     + </Directory>
36     +
37     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
38     --- smeserver-madsonic-5.0.3761.old/root/etc/e-smith/templates/etc/sysconfig/madsonic/40madsonic 2022-07-23 16:56:06.159000000 -0400
39     +++ smeserver-madsonic-5.0.3761/root/etc/e-smith/templates/etc/sysconfig/madsonic/40madsonic 2022-07-23 17:04:33.903000000 -0400
40     @@ -16,23 +16,26 @@
41     # MADSONIC_ARGS="--port=80 --https-port=443 --init-memory=192 --max-memory=384"
42    
43    
44     -MADSONIC_ARGS="{
45     -my $madhome = $madsonic{'home'} || "/var/madsonic";
46     -my $madhost = $madsonic{'host'} || "0.0.0.0";
47     -my $madport = $madsonic{'port'} || "4041";
48     -my $madpath = $madsonic{'path'} || "/madsonic";
49     -my $madhttps_port = $madsonic{'https_port'} || "0";
50     -my $madinitmem = $madsonic{'InitMemory'} || "200";
51     -my $madmem = $madsonic{'MaxMemory'} || "350";
52     -my $madpid = $madsonic{'PIDfile'} || "";
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     +#MADSONIC_ARGS="{
62     +$madhome = $madsonic{'home'} || "/var/madsonic";
63     +$madhost = $madsonic{'host'} || "0.0.0.0";
64     +$madport = $madsonic{'port'} || "4041";
65     +$madpath = $madsonic{'path'} || "/madsonic";
66     +$madhttps_port = $madsonic{'https_port'} || "0";
67     +$madinitmem = $madsonic{'InitMemory'} || "200";
68     +$madmem = $madsonic{'MaxMemory'} || "350";
69     +$madpid = $madsonic{'PIDfile'} || "";
70     +$madmusic = $madsonic{'Music_Folder'} || "/var/media";
71     +$madpod = $madsonic{'Podcast_Folder'} || "/var/media/podcast";
72     +$madinco = $madsonic{'Inco_Folder'} || "/var/media/incoming";
73     +$madimpo = $madsonic{'Impo_Folder'} || "/var/media/playlists/import";
74     +$madexpo = $madsonic{'Expo_Folder'} || "/var/media/playlists/export";
75     +$madback = $madsonic{'Back_Folder'} || "/var/media/playlists/backup";
76     +$madtest = $madsonic{'TestMode'} || "false";
77     +$madgzip = $madsonic{'gzip'} || "true";
78     +$madtrans = $madsonic{'TranscodeFolder'} || "";
79     +use DateTime::TimeZone;
80     +$madtz= $madsonic{"timezone"} || DateTime::TimeZone->new( name => 'local' )->name();
81    
82     $OUT .= "--max-memory=$madmem --context-path='$madpath'";
83    
84     @@ -43,14 +46,13 @@
85     $OUT .= " --pidfile='$madpid'" unless $madpid eq "";
86     $OUT .= " --default-music-folder='$madmusic'" unless $madmusic eq "/var/media";
87     $OUT .= " --default-podcast-folder='$madpod'" unless $madpod eq "/var/media/podcast";
88     -$OUT .= " --default-playlist-folder='$madplay'" unless $madplay eq "/var/media/playlists";
89     $OUT .= " --default-playlist-import-folder='$madimpo'" unless $madimpo eq "/var/media/playlists/import";
90     $OUT .= " --default-playlist-export-folder='$madexpo'" unless $madexpo eq "/var/media/playlists/export";
91     $OUT .= " --default-playlist-backup-folder='$madback'" unless $madback eq "/var/media/playlists/backup";
92     $OUT .= " --init-memory=$madinitmem";
93     $OUT .= " --max-memory=$madmem";
94     }"
95     -
96     +
97    
98     # The user which should run the Mabsonic process. Default "root".
99     # Note that non-root users are by default not allowed to use ports
100     @@ -59,3 +61,21 @@
101    
102     MADSONIC_USER=madsonic
103    
104     +###for madsonic.service
105     +MADSONIC_HOME={$madhome}
106     +MADSONIC_HOST={$madhost}
107     +MADSONIC_PORT={$madport}
108     +MADSONIC_HTTPS_PORT={$madhttps_port}
109     +MADSONIC_CONTEXT_PATH={$madpath}
110     +MADSONIC_MAX_MEMORY={$madmem}
111     +MADSONIC_DEFAULT_MUSIC_FOLDER={$madmusic}
112     +MADSONIC_DEFAULT_UPLOAD_FOLDER={$madinco}
113     +MADSONIC_DEFAULT_PODCAST_FOLDER={$madpod}
114     +MADSONIC_DEFAULT_PLAYLIST_IMPORT_FOLDER={$madimpo}
115     +MADSONIC_DEFAULT_PLAYLIST_EXPORT_FOLDER={$madexpo}
116     +MADSONIC_DEFAULT_PLAYLIST_BACKUP_FOLDER={$madback}
117     +MADSONIC_DEFAULT_TRANSCODE_FOLDER={$madtrans}
118     +MADSONIC_DEFAULT_TIMEZONE={$madtz}
119     +MADSONIC_GZIP={$madgzip}
120     +MADSONIC_TEST={$madtest}
121     +
122     diff -Nur --no-dereference smeserver-madsonic-5.0.3761.old/root/var/www/backend/validateLicense.view smeserver-madsonic-5.0.3761/root/var/www/backend/validateLicense.view
123     --- smeserver-madsonic-5.0.3761.old/root/var/www/backend/validateLicense.view 1969-12-31 19:00:00.000000000 -0500
124     +++ smeserver-madsonic-5.0.3761/root/var/www/backend/validateLicense.view 2022-07-23 17:07:37.720000000 -0400
125     @@ -0,0 +1 @@
126     +true
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed