Smaller fixes

This commit is contained in:
Diederik de Groot
2019-04-15 14:59:59 +02:00
parent 1c6b4ae7eb
commit f2c3728935
5 changed files with 48 additions and 46 deletions

View File

@@ -0,0 +1,29 @@
Listen 6970
<VirtualHost *:6970>
DocumentRoot "/tftpboot"
ErrorLog /var/log/httpd/tftp.error.log
CustomLog /var/log/httpd/tftp.access.log combined
<Directory /tftpboot>
Options FollowSymlinks
AllowOverride none
Require all granted
RewriteEngine on
RewriteBase "/"
RewriteCond "/tftpboot/%{REQUEST_FILENAME}" !-f
RewriteCond "/tftpboot/%{REQUEST_FILENAME}" !-d
RewriteRule "(.*)" "index.php?id=$1" [PT,QSA]
</Directory>
<Directory />
Options FollowSymLinks
AllowOverride all
Require all granted
</Directory>
<Location />
Require all granted
</Location>
Alias / "/tftpboot/"
</VirtualHost>

View File

@@ -1,27 +0,0 @@
#
# ---------------- Apache 2 ( httpd ) Configuration to support the starting load of the cisco phones via HTTP.
Listen 6970
NameVirtualHost *:6970
<VirtualHost *:6970>
DocumentRoot "/tftpboot"
# DocumentRoot "/data/development/sccp/sources/tftp/tftpboot"
# server_name default
ErrorLog /var/log/httpd/tftp.error.log
CustomLog /var/log/httpd/tftp.access.log combined
# Other directives here
<Directory /tftpboot>
RewriteEngine on
RewriteBase "/"
RewriteCond "/tftpboot/%{REQUEST_FILENAME}" !-f
RewriteCond "/tftpboot/%{REQUEST_FILENAME}" !-d
RewriteRule "(.*)" "index.php?id=$1" [PT,QSA]
</Directory>
# <Directory /data/development/sccp/sources/tftp/tftpboot>
# RewriteEngine on
# RewriteBase "/"
# RewriteCond "/data/development/sccp/sources/tftp/tftpboot/%{REQUEST_FILENAME}" !-f
# RewriteCond "/data/development/sccp/sources/tftp/tftpboot/%{REQUEST_FILENAME}" !-d
# RewriteRule "(.*)" "index.php?id=$1" [PT,QSA]
# </Directory>
</VirtualHost>

View File

@@ -40,7 +40,7 @@ $request = $_REQUEST;
$req_file = !empty($request['id']) ? $request['id'] : '';
# directory content extensions map
$fw_suffix = array('.bin', '.loads', '.sbn', '.sb2', '.sbin', '.zz', '.zup');
$fw_suffix = array('.bin', '.loads', '.sbn', '.sb2', '.sbin', '.zz', '.zup', '.loads');
//$settings_suffix = array('cnf.xml');

View File

@@ -6,7 +6,7 @@ if [ ! -z "`ls *.pcm 2>/dev/null`" ]; then
basename=`basename ${filename} .pcm`
echo -e "\t<Ring>" >>$outfile
echo -e "\t\t<DisplayName>${basename}</DisplayName>" >>$outfile
echo -e "\t\t<FileName>${filename}</FileName>" >>$outfile
echo -e "\t\t<FileName>ringtones\${filename}</FileName>" >>$outfile
echo -e "\t</Ring>" >>$outfile
done
fi
@@ -15,7 +15,7 @@ if [ ! -z "`ls *.raw 2>/dev/null`" ]; then
basename=`basename ${filename} .raw`
echo -e "\t<Ring>" >>$outfile
echo -e "\t\t<DisplayName>${basename}</DisplayName>" >>$outfile
echo -e "\t\t<FileName>${filename}</FileName>" >>$outfile
echo -e "\t\t<FileName>ringtones\${filename}</FileName>" >>$outfile
echo -e "\t</Ring>" >>$outfile
done
fi

View File

@@ -1,62 +1,62 @@
<CiscoIPPhoneRingList>
<CiscoIPPhoneRingList>
<Ring>
<DisplayName>drums1</DisplayName>
<FileName>drums1.pcm</FileName>
<FileName>ringtones\drums1.pcm</FileName>
</Ring>
<Ring>
<DisplayName>drums2</DisplayName>
<FileName>drums2.pcm</FileName>
<FileName>ringtones\drums2.pcm</FileName>
</Ring>
<Ring>
<DisplayName>loudc1</DisplayName>
<FileName>loudc1.pcm</FileName>
<FileName>ringtones\loudc1.pcm</FileName>
</Ring>
<Ring>
<DisplayName>loudc2</DisplayName>
<FileName>loudc2.pcm</FileName>
<FileName>ringtones\loudc2.pcm</FileName>
</Ring>
<Ring>
<DisplayName>loudlaser</DisplayName>
<FileName>loudlaser.pcm</FileName>
<FileName>ringtones\loudlaser.pcm</FileName>
</Ring>
<Ring>
<DisplayName>merlin2</DisplayName>
<FileName>merlin2.pcm</FileName>
<FileName>ringtones\merlin2.pcm</FileName>
</Ring>
<Ring>
<DisplayName>merlin3</DisplayName>
<FileName>merlin3.pcm</FileName>
<FileName>ringtones\merlin3.pcm</FileName>
</Ring>
<Ring>
<DisplayName>merlin4</DisplayName>
<FileName>merlin4.pcm</FileName>
<FileName>ringtones\merlin4.pcm</FileName>
</Ring>
<Ring>
<DisplayName>merlin5</DisplayName>
<FileName>merlin5.pcm</FileName>
<FileName>ringtones\merlin5.pcm</FileName>
</Ring>
<Ring>
<DisplayName>merlin6</DisplayName>
<FileName>merlin6.pcm</FileName>
<FileName>ringtones\merlin6.pcm</FileName>
</Ring>
<Ring>
<DisplayName>merlin7</DisplayName>
<FileName>merlin7.pcm</FileName>
<FileName>ringtones\merlin7.pcm</FileName>
</Ring>
<Ring>
<DisplayName>ringer1</DisplayName>
<FileName>ringer1.pcm</FileName>
<FileName>ringtones\ringer1.pcm</FileName>
</Ring>
<Ring>
<DisplayName>ringer2</DisplayName>
<FileName>ringer2.pcm</FileName>
<FileName>ringtones\ringer2.pcm</FileName>
</Ring>
<Ring>
<DisplayName>ringer3</DisplayName>
<FileName>ringer3.pcm</FileName>
<FileName>ringtones\ringer3.pcm</FileName>
</Ring>
<Ring>
<DisplayName>ringer4</DisplayName>
<FileName>ringer4.pcm</FileName>
<FileName>ringtones\ringer4.pcm</FileName>
</Ring>
</CiscoIPPhoneRingList>