From 77a0cbc2a73b9f8b4e267e3a60294df38a286b0b Mon Sep 17 00:00:00 2001 From: Diederik de Groot Date: Fri, 22 Mar 2019 10:20:48 +0100 Subject: [PATCH] Update 7940/60 rewrite rules Update locale rewrite rules --- etc/nginx/sites-available/tftpboot | 16 +++++++++++----- etc/tftpd-hpa/rewrite.rules | 13 ++++++++++--- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/etc/nginx/sites-available/tftpboot b/etc/nginx/sites-available/tftpboot index c1ddbd2..1e39f2a 100644 --- a/etc/nginx/sites-available/tftpboot +++ b/etc/nginx/sites-available/tftpboot @@ -23,7 +23,13 @@ server { # locales rewrite ^/(.*)/((.*)-tones\.xml(\.sgn)?)$ /locales/countries/$1/$2 last; - rewrite ^/(.*)/((.*)(-dictionary\.xml|\.jar)(\.sgn)?)$ /locales/languages/$1/$2 last; + rewrite ^/(.*)/((.*)(-dictionary(.*)\.xml)(\.sgn)?)$ /locales/languages/$1/$2 last; + rewrite ^/(.*)/((.*)(-kate(.*)\.xml)(\.sgn)?)$ /locales/languages/$1/$2 last; + rewrite ^/(.*)/((.*)(-sccp\.jar)(\.sgn)?)$ /locales/languages/$1/$2 last; + rewrite ^/(.*)/((.*)(-font\.xml)(\.sgn)?)$ /locales/languages/$1/$2 last; + rewrite ^/(.*)/(CIPC_Locale\.(.*))(\.sgn)?)$ /locales/languages/$1/$2 last; + + rewrite ^/(.*)/((.*)(-tones.xml)(\.sgn)?)$ /locales/countries/$1/$2 last; # ringtones rewrite ^/([D|d]istinctive)?([R|r]ing[L|l]ist)\.(xml|XML)(\.sgn)?$ /ringtones/ringlist.xml last; @@ -143,10 +149,10 @@ server { rewrite ^/firmware/(apps37sccp.1-4-5-7.bin)$ /firmware/7937/$1 last; # 7940_7960 firmware (ancient) - rewrite ^/firmware/(P0030801SR01.bin)$ /firmware/7940_7960/$1 last; - rewrite ^/firmware/(P0030801SR01.loads)$ /firmware/7940_7960/$1 last; - rewrite ^/firmware/(P0030801SR01.sb2)$ /firmware/7940_7960/$1 last; - rewrite ^/firmware/(P0030801SR01.sbn)$ /firmware/7940_7960/$1 last; + rewrite ^/firmware/(P0030801SR.+\.bin)$ /firmware/7940_7960/$1 last; + rewrite ^/firmware/(P0030801SR.+\.loads)$ /firmware/7940_7960/$1 last; + rewrite ^/firmware/(P0030801SR.+\.sb2)$ /firmware/7940_7960/$1 last; + rewrite ^/firmware/(P0030801SR.+\.sbn)$ /firmware/7940_7960/$1 last; # 7941_7961 firmware (java-based) rewrite ^/firmware/(apps41.+\.sbn)$ /firmware/7941_7961/$1 last; diff --git a/etc/tftpd-hpa/rewrite.rules b/etc/tftpd-hpa/rewrite.rules index 81c512f..e169e26 100644 --- a/etc/tftpd-hpa/rewrite.rules +++ b/etc/tftpd-hpa/rewrite.rules @@ -98,6 +98,10 @@ ri ^(cmterm_7936.3-3-21-0.bin)$ firmware/7936/\1 ri ^(apps37sccp.1-4-5-7.bin)$ firmware/7937/\1 # 7940_7960 firmware (ancient) +ri ^(P0030801SR.bin)$ firmware/7940/\1 +ri ^(P0030801SR.loads)$ firmware/7940/\1 +ri ^(P0030801SR.sb2)$ firmware/7940/\1 +ri ^(P0030801SR.sbn)$ firmware/7940/\1 ri ^(P0030801SR01.bin)$ firmware/7940/\1 ri ^(P0030801SR01.loads)$ firmware/7940/\1 ri ^(P0030801SR01.sb2)$ firmware/7940/\1 @@ -177,9 +181,12 @@ ri ^\/((SPA504G-cfg.xml)(\.enc)?(\.sgn)?)$ settings/\1 #ri ^(.+\.sbn)$ firmware/\1 # Keep locales in a separate directory (optional) -ri ^(.+)\/(.+-sccp.jar)$ locales/languages/\1/\2 -ri ^(.+)\/(.+-dictionary.xml)$ locales/languages/\1/\2 -ri ^(.+)\/(.+-tones.xml)$ locales/countries/\1/\2 +ri ^(.+)\/(.+-sccp.jar(.+\.sgn)?)$ locales/languages/\1/\2 +ri ^(.+)\/(.+-dictionary.+.xml(.+\.sgn)?)$ locales/languages/\1/\2 +ri ^(.+)\/(.+-font.xml(.+\.sgn)?)$ locales/languages/\1/\2 +ri ^(.+)\/(.+-kate.+\.xml(.+\.sgn)?)$ locales/languages/\1/\2 +ri ^(.+)\/(CIPC_Locale\..+(.+\.sgn)?)$ locales/languages/\1/\2 +ri ^(.+)\/(.+-tones.xml(.+\.sgn)?)$ locales/countries/\1/\2 # Keep ring-tones in a separate directory (optional) ri ^([R|r]ing[L|l]ist)(\.xml|-wb\.xml)(\.sgn)?$ ringtones/ringlist.xml