Merge ata186 and ata188

Update ringtones
Add Desktops/wallpapers
This commit is contained in:
Diederik de Groot
2017-11-14 16:11:32 +01:00
parent 365e858aad
commit 8cdb4e64f0
6 changed files with 50 additions and 226 deletions

View File

@@ -6,18 +6,20 @@ server {
index XMLDefault.cnf.xml;
# Normal Logging
access_log /var/log/nginx/tftp.access.log;
error_log /var/log/nginx/tftp.error.log;
#access_log /var/log/nginx/tftp.access.log;
#error_log /var/log/nginx/tftp.error.log;
# Debug Rewrite Rules
#rewrite_log on;
#access_log /var/log/nginx/tftp.access.log;
#error_log /var/log/nginx/tftp.error.log notice;
rewrite_log on;
access_log /var/log/nginx/tftp.access.log;
error_log /var/log/nginx/tftp.error.log notice;
location / {
rewrite ^/((.*).cnf.xml)$ /settings/$1 last;
rewrite ^/((.*).(bin|bin.|loads|LOADS|sbn|SBN|sb2|sbin|zz|zup)(|.sgn))$ /firmware/$1;
rewrite ^/(RINGLIST|RingList|Ringlist|ringlist).(xml|XML)$ /ringtones/ringlist.xml;
rewrite ^/((.*).(bin|bin.|loads|LOADS|sbn|SBN|sb2|sbin|zz|zup)(|.sgn))$ /firmware/$1 last;
rewrite ^/([D|d]istinctive)?([R|r]ing[L|l]ist).(xml|XML)(.sgn)?$ /ringtones/ringlist.xml last;
#rewrite ^/((.*)(.raw|pcm)(|.sgn))$ /ringtones/$1 last;
rewrite ^/Desktops/(.*)/(.*)$ /wallpapers/$1/$2 last;
try_files $uri $uri/ =404;
autoindex off;
}
@@ -203,8 +205,14 @@ server {
}
# ringtones
location /ringtones/(.*).(xml|raw|pcm) {
try_files ringtones/$uri ringtones/$uri/ =404;
location /ringtones {
try_files $uri $uri/ =404;
autoindex off;
}
# wallpapers
location /wallpapers {
try_files $uri $uri/ =404;
autoindex off;
}

View File

@@ -1,19 +1,23 @@
#!/usr/bin/env bash
outfile=ringlist.xml
echo -e "<CiscoIPPhoneRingList>" >$outfile
for filename in *.pcm;do
basename=`basename ${filename} .pcm`
echo -e "\t<Ring>" >>$outfile
echo -e "\t\t<DisplayName>${basename}</DisplayName>" >>$outfile
echo -e "\t\t<FileName>ringtones/${filename}</DisplayName>" >>$outfile
echo -e "\t</Ring>" >>$outfile
done
for filename in *.raw;do
basename=`basename ${filename} .raw`
echo -e "\t<Ring>" >>$outfile
echo -e "\t\t<DisplayName>${basename}</DisplayName>" >>$outfile
echo -e "\t\t<FileName>ringtones/${filename}</DisplayName>" >>$outfile
echo -e "\t</Ring>" >>$outfile
done
if [ ! -z "`ls *.pcm 2>/dev/null`" ]; then
for filename in *.pcm;do
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</Ring>" >>$outfile
done
fi
if [ ! -z "`ls *.raw 2>/dev/null`" ]; then
for filename in *.raw;do
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</Ring>" >>$outfile
done
fi
echo -e "</CiscoIPPhoneRingList>" >>$outfile

View File

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

View File

@@ -1,184 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<device>
<fullConfig>true</fullConfig>
<sshUserId>cisco</sshUserId>
<sshPassword>cisco</sshPassword>
<ipAddressMode>2</ipAddressMode>
<ipPreferenceModeControl>1</ipPreferenceModeControl>
<allowAutoConfig>true</allowAutoConfig>
<devicePool uuid="{1b1b9eb6-7803-11d3-bdf0-00108302ead1}">
<revertPriority>1</revertPriority>
<dateTimeSetting>
<dateTemplate>M/D/YA</dateTemplate>
<timeZone>W. Europe Standard/Daylight Time</timeZone>
<ntps>
<ntp>
<name>213.109.127.195</name>
<ntpMode>Unicast</ntpMode>
</ntp>
</ntps>
</dateTimeSetting>
<callManagerGroup>
<members>
<member priority="0">
<callManager>
<name>moviebox</name>
<ipv6Addr>2001:470:1f15:3ce::466</ipv6Addr>
<ports>
<ethernetPhonePort>2000</ethernetPhonePort>
</ports>
<!--<processNodeName>moviebox.talon1.nl</processNodeName>-->
<processNodeName>192.168.178.3</processNodeName>
</callManager>
</member>
<!-- <member priority="1">
<callManager>
<name>asterisk.chan-sccp.net</name>
<ipv6Addr>2a00:1158:3::185</ipv6Addr>
<ports>
<ethernetPhonePort>2000</ethernetPhonePort>
</ports>
<processNodeName>asterisk.chan-sccp.net</processNodeName>
</callManager>
</member>-->
</members>
</callManagerGroup>
<srstInfo>
<srstOption>Enable</srstOption>
<ipAddr1>185.21.103.35</ipAddr1>
<port1>2000</port1>
<ipAddr2></ipAddr2>
<port2></port2>
<isSecure>false</isSecure>
</srstInfo>
<connectionMonitorDuration>60</connectionMonitorDuration>
</devicePool>
<commonProfile>
<phonePassword>1234</phonePassword>
<defaultBackground>http://192.168.178.3/Chan-SCCP-b.png</defaultBackground>
<backgroundImageAccess>true</backgroundImageAccess>
<callLogBlfEnabled>3</callLogBlfEnabled>
</commonProfile>
<vendorConfig>
<disableSpeaker>false</disableSpeaker>
<disableSpeakerAndHeadset>false</disableSpeakerAndHeadset>
<forwardingDelay>1</forwardingDelay>
<settingsAccess>1</settingsAccess>
<videoCapability>1</videoCapability>
<autoSelectLineEnable>0</autoSelectLineEnable>
<webAccess>0</webAccess>
<daysDisplayNotActive>1,7</daysDisplayNotActive>
<displayOnTime>08:30</displayOnTime>
<displayOnDuration>11:30</displayOnDuration>
<displayIdleTimeout>01:00</displayIdleTimeout>
<displayOnWhenIncomingCall>1</displayOnWhenIncomingCall>
<loggingDisplay>1</loggingDisplay>
<autoCallSelect>0</autoCallSelect>
<logServer>192.168.178.3:9001</logServer>
<enableCdpSwPort>1</enableCdpSwPort>
<enableCdpPcPort>1</enableCdpPcPort>
<enableLldpSwPort>1</enableLldpSwPort>
<enableLldpPcPort>1</enableLldpPcPort>
<lldpAssetId>Cisco Phone</lldpAssetId>
<powerPriority>1</powerPriority>
<ipv6LoadServer>2001:470:1f15:3ce::466</ipv6LoadServer>
<ipv6LogServer>2001:470:1f15:3ce::466:9001</ipv6LogServer>
<detectCMConnectionFailure>0</detectCMConnectionFailure>
<rtpcontrolprotocol>1</rtpcontrolprotocol>
<g722CodecSupport>2</g722CodecSupport>
<advertiseG722Codec>1</advertiseG722Codec>
<sshAccess>0</sshAccess>
<pcPort>0</pcPort>
<spanToPCPort>0</spanToPCPort>
</vendorConfig>
<userLocale>
<name>English_United_States</name>
<uid>39</uid>
<langCode>en_US</langCode>
<version>9.3(2.9902)US</version>
<winCharSet>utf-8</winCharSet>
</userLocale>
<networkLocale>United_States</networkLocale>
<deviceSecurityMode>1</deviceSecurityMode>
<informationURL>http://192.168.178.3/cisco_menu/help/help.php</informationURL>
<authenticationURL>http://192.168.178.3/authenticate.php</authenticationURL>
<servicesURL>http://192.168.178.3/tests.xml</servicesURL>
<directoryURL>http://192.168.178.3/CiscoDirectory/phonebook.php</directoryURL>
<messagesURL/>
<proxyServerURL/>
<dscpForSCCPPhoneConfig>96</dscpForSCCPPhoneConfig>
<dscpForSCCPPhoneServices>0</dscpForSCCPPhoneServices>
<dscpForCm2Dvce>184</dscpForCm2Dvce>
<dndCallAlert>5</dndCallAlert>
<dndReminderTimer>60</dndReminderTimer>
<phonePersonalization>1</phonePersonalization>
<rollover>0</rollover>
<singleButtonBarge>1</singleButtonBarge>
<joinAcrossLines>1</joinAcrossLines>
<autoCallPickupEnable>true</autoCallPickupEnable>
<blfAudibleAlertSettingOfIdleStation>1</blfAudibleAlertSettingOfIdleStation>
<blfAudibleAlertSettingOfBusyStation>1</blfAudibleAlertSettingOfBusyStation>
<transportLayerProtocol>4</transportLayerProtocol>
<encrConfig>false</encrConfig>
<g722CodecSupport>2</g722CodecSupport>
<advertiseG722Codec>1</advertiseG722Codec>
<userId>dkgroot</userId>
<phoneServices>
<provisioning>0</provisioning>
<phoneService type="1" category="0">
<name>Missed Calls</name>
<url>Application:Cisco/MissedCalls</url>
<vendor/>
<version/>
</phoneService>
<phoneService type="1" category="0">
<name>Received Calls</name>
<url>Application:Cisco/ReceivedCalls</url>
<vendor/>
<version/>
</phoneService>
<phoneService type="1" category="0">
<name>Placed Calls</name>
<url>Application:Cisco/PlacedCalls</url>
<vendor/>
<version/>
</phoneService>
<phoneService type="1" category="0">
<name>Personal Directory</name>
<url>Application:Cisco/PersonalDirectory</url>
<vendor/>
<version/>
</phoneService>
<phoneService type="2" category="0">
<name>Voicemail</name>
<url>Application:Cisco/Voicemail</url>
<vendor/>
<version/>
</phoneService>
<phoneService type="0" category="0">
<name>Tests</name>
<url>http://192.168.178.3/tests.xml</url>
<vendor/>
<version/>
</phoneService>
<phoneService type="0" category="0">
<name>Corporate Directory</name>
<url>http://172.17.3.1/cisco-addressbook/</url>
<vendor/>
<version/>
</phoneService>
<phoneService type="1" category="0">
<displayName>Intercom Calls</displayName>
<name>Intercom Calls</name>
<url>Application:Cisco/IntercomCalls</url>
<vendor/>
<version/>
</phoneService>
<phoneService type="0" category="0">
<name>Extension Mobility</name>
<url>http://192.168.178.3/emapp/EMAppServlet?device=#DEVICENAME#&amp;emmcmode=#EMCC#</url>
<vendor/>
<version/>
</phoneService>
</phoneServices>
</device>