diff --git a/etc/nginx/sites-available/tftpboot b/etc/nginx/sites-available/tftpboot index f236512..ac92037 100644 --- a/etc/nginx/sites-available/tftpboot +++ b/etc/nginx/sites-available/tftpboot @@ -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; } diff --git a/tftpboot/firmware/ata186/ATA030204SCCP090202A.zup b/tftpboot/firmware/ata186_188/ATA030204SCCP090202A.zup similarity index 100% rename from tftpboot/firmware/ata186/ATA030204SCCP090202A.zup rename to tftpboot/firmware/ata186_188/ATA030204SCCP090202A.zup diff --git a/tftpboot/firmware/ata188/ATA030204SCCP090202A.zup b/tftpboot/firmware/ata188/ATA030204SCCP090202A.zup deleted file mode 100644 index 9d03de2..0000000 Binary files a/tftpboot/firmware/ata188/ATA030204SCCP090202A.zup and /dev/null differ diff --git a/tftpboot/ringtones/mkringlist.sh b/tftpboot/ringtones/mkringlist.sh index 55090bc..a54a400 100755 --- a/tftpboot/ringtones/mkringlist.sh +++ b/tftpboot/ringtones/mkringlist.sh @@ -1,19 +1,23 @@ #!/usr/bin/env bash outfile=ringlist.xml echo -e "" >$outfile -for filename in *.pcm;do - basename=`basename ${filename} .pcm` - echo -e "\t" >>$outfile - echo -e "\t\t${basename}" >>$outfile - echo -e "\t\tringtones/${filename}" >>$outfile - echo -e "\t" >>$outfile -done -for filename in *.raw;do - basename=`basename ${filename} .raw` - echo -e "\t" >>$outfile - echo -e "\t\t${basename}" >>$outfile - echo -e "\t\tringtones/${filename}" >>$outfile - echo -e "\t" >>$outfile -done +if [ ! -z "`ls *.pcm 2>/dev/null`" ]; then + for filename in *.pcm;do + basename=`basename ${filename} .pcm` + echo -e "\t" >>$outfile + echo -e "\t\t${basename}" >>$outfile + echo -e "\t\t${filename}" >>$outfile + echo -e "\t" >>$outfile + done +fi +if [ ! -z "`ls *.raw 2>/dev/null`" ]; then + for filename in *.raw;do + basename=`basename ${filename} .raw` + echo -e "\t" >>$outfile + echo -e "\t\t${basename}" >>$outfile + echo -e "\t\t${filename}" >>$outfile + echo -e "\t" >>$outfile + done +fi echo -e "" >>$outfile diff --git a/tftpboot/ringtones/ringlist.xml b/tftpboot/ringtones/ringlist.xml index e9f5e81..bff02a9 100644 --- a/tftpboot/ringtones/ringlist.xml +++ b/tftpboot/ringtones/ringlist.xml @@ -1,66 +1,62 @@ drums1 - ringtones/drums1.pcm + drums1.pcm drums2 - ringtones/drums2.pcm + drums2.pcm loudc1 - ringtones/loudc1.pcm + loudc1.pcm loudc2 - ringtones/loudc2.pcm + loudc2.pcm loudlaser - ringtones/loudlaser.pcm + loudlaser.pcm merlin2 - ringtones/merlin2.pcm + merlin2.pcm merlin3 - ringtones/merlin3.pcm + merlin3.pcm merlin4 - ringtones/merlin4.pcm + merlin4.pcm merlin5 - ringtones/merlin5.pcm + merlin5.pcm merlin6 - ringtones/merlin6.pcm + merlin6.pcm merlin7 - ringtones/merlin7.pcm + merlin7.pcm ringer1 - ringtones/ringer1.pcm + ringer1.pcm ringer2 - ringtones/ringer2.pcm + ringer2.pcm ringer3 - ringtones/ringer3.pcm + ringer3.pcm ringer4 - ringtones/ringer4.pcm - - - * - ringtones/*.raw + ringer4.pcm diff --git a/tftpboot/settings/SEP0023043403F9.cnf.xml b/tftpboot/settings/SEP0023043403F9.cnf.xml deleted file mode 100644 index c4804b1..0000000 --- a/tftpboot/settings/SEP0023043403F9.cnf.xml +++ /dev/null @@ -1,184 +0,0 @@ - - - true - cisco - cisco - 2 - 1 - true - - 1 - - M/D/YA - W. Europe Standard/Daylight Time - - - 213.109.127.195 - Unicast - - - - - - - - moviebox - 2001:470:1f15:3ce::466 - - 2000 - - - 192.168.178.3 - - - - - - - Enable - 185.21.103.35 - 2000 - - - false - - 60 - - - 1234 - http://192.168.178.3/Chan-SCCP-b.png - true - 3 - - - false - false - 1 - 1 - 1 - 0 - 0 - 1,7 - 08:30 - 11:30 - 01:00 - 1 - 1 - 0 - 192.168.178.3:9001 - 1 - 1 - 1 - 1 - Cisco Phone - 1 - 2001:470:1f15:3ce::466 - 2001:470:1f15:3ce::466:9001 - 0 - 1 - 2 - 1 - 0 - 0 - 0 - - - English_United_States - 39 - en_US - 9.3(2.9902)US - utf-8 - - United_States - 1 - http://192.168.178.3/cisco_menu/help/help.php - http://192.168.178.3/authenticate.php - http://192.168.178.3/tests.xml - http://192.168.178.3/CiscoDirectory/phonebook.php - - - 96 - 0 - 184 - 5 - 60 - 1 - 0 - 1 - 1 - true - 1 - 1 - 4 - false - 2 - 1 - dkgroot - - 0 - - Missed Calls - Application:Cisco/MissedCalls - - - - - Received Calls - Application:Cisco/ReceivedCalls - - - - - Placed Calls - Application:Cisco/PlacedCalls - - - - - Personal Directory - Application:Cisco/PersonalDirectory - - - - - Voicemail - Application:Cisco/Voicemail - - - - - Tests - http://192.168.178.3/tests.xml - - - - - Corporate Directory - http://172.17.3.1/cisco-addressbook/ - - - - - Intercom Calls - Intercom Calls - Application:Cisco/IntercomCalls - - - - - Extension Mobility - http://192.168.178.3/emapp/EMAppServlet?device=#DEVICENAME#&emmcmode=#EMCC# - - - - -