safebox/default-applications-tree
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'correcting naming' (#118) from dev into main

Browse Source 
Reviewed-on: #118
This commit was merged in pull request #118.
This commit is contained in:
Gyorgy Berenyi
2026-08-06 14:50:11 +00:00
parent e5016bcadf a01b507735
commit be6fa58251
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openwebui/service-openwebui.json
+3 -6
View File
@@ -24,7 +24,7 @@
], ],
"START_ON_BOOT": "false", "START_ON_BOOT": "false",
"ENTRYPOINT": "sh -c", "ENTRYPOINT": "sh -c",
"CMD": "mkdir -p /etc/user/data/openwebui/data && mkdir -p /etc/user/data/openwebui/db && mkdir -p /etc/user/data/openwebui/qdrant && mkdir -p /etc/user/data/openwebui/searxng && mkdir -p /etc/user/data/openwebui/crawl4ai && printf %s c2VydmVyOgogIGJpbmRfYWRkcmVzczogMC4wLjAuMAogIHBvcnQ6IDgwODAKICBsaW1pdGVyOiBmYWxzZQogIHB1YmxpY19pbnN0YW5jZTogZmFsc2UKc2VhcmNoOgogIGZvcm1hdHM6CiAgICAtIGh0bWwKICAgIC0ganNvbgp1aToKICBzdGF0aWNfdXNlX2hhc2g6IHRydWUKdmFsa2V5OgogIHVybDogZmFsc2UKb3V0Z29pbmc6CiAgdXNlcmFnZW50OiBNb3ppbGxhLzUuMCAoV2luZG93cyBOVCAxMC4wOyBXaW42NDsgeDY0KSBBcHBsZVdlYktpdC81MzcuMzYgKEtIVE1MLCBsaWtlIEdlY2tvKSBDaHJvbWUvMTMxLjAuMC4wIFNhZmFyaS81MzcuMzYKdXNlX2RlZmF1bHRfc2V0dGluZ3M6CiAgZW5naW5lczoKICAgIHJlbW92ZToKICAgICAgLSBhaG1pYQogICAgICAtIHRvcmNoCiAgICAgIC0gd2lraWRhdGEK | base64 -d > /etc/user/data/openwebui/searxng/settings.yml && printf %s W2JvdGRldGVjdGlvbl0KCiMgVGhlIHByZWZpeCBkZWZpbmVzIHRoZSBudW1iZXIgb2YgbGVhZGluZyBiaXRzIGluIGFuIGFkZHJlc3MgdGhhdCBhcmUgY29tcGFyZWQKIyB0byBkZXRlcm1pbmUgd2hldGhlciBvciBub3QgYW4gYWRkcmVzcyBpcyBwYXJ0IG9mIGEgKGNsaWVudCkgbmV0d29yay4KaXB2NF9wcmVmaXggPSAzMgppcHY2X3ByZWZpeCA9IDQ4CgojIE5ldHdvcmtzIG9mIHRoZSByZXZlcnNlIHByb3hpZXMgLyBsb2FkIGJhbGFuY2VycyAvIGludGVybmFsIERvY2tlciBnYXRld2F5cyBpbgojIGZyb250IG9mIHRoaXMgaW5zdGFuY2UuIFJlcXVlc3RzIGZyb20gdGhlc2UgbmV0d29ya3MgbWF5IGNhcnJ5CiMgWC1Gb3J3YXJkZWQtRm9yIC8gWC1SZWFsLUlQLCBhbmQgdGhlIHJlYWwgY2xpZW50IElQIGlzIGV4dHJhY3RlZCBmcm9tIHRoZW0uCiMgSW50ZXJuYWwgRG9ja2VyIG5ldHdvcmtzIGFyZSBpbmNsdWRlZCBzbyBhIGZ1dHVyZSByZXZlcnNlIHByb3h5IG9uIHRoaXMgaG9zdAojIGlzIGhhbmRsZWQgY29ycmVjdGx5Lgp0cnVzdGVkX3Byb3hpZXMgPSBbCiAgIjEyNy4wLjAuMC84IiwKICAiOjoxIiwKICAiMTAuMC4wLjAvOCIsCiAgIjE3Mi4xNi4wLjAvMTIiLAogICIxOTIuMTY4LjAuMC8xNiIsCiAgImZkMDA6Oi84IiwKXQoKW2JvdGRldGVjdGlvbi5pcF9saW1pdF0KCmZpbHRlcl9saW5rX2xvY2FsID0gZmFsc2UKbGlua190b2tlbiA9IGZhbHNlCgpbYm90ZGV0ZWN0aW9uLmlwX2xpc3RzXQoKIyBJbnRlcm5hbCAvIGxvY2FsIG5ldHdvcmtzIGFyZSB0cnVzdGVkIGFuZCBuZXZlciByYXRlLWxpbWl0ZWQgb3IgYmxvY2tlZC4KcGFzc19pcCA9IFsKICAiMTI3LjAuMC4wLzgiLAogICI6OjEiLAogICIxMC4wLjAuMC84IiwKICAiMTcyLjE2LjAuMC8xMiIsCiAgIjE5Mi4xNjguMC4wLzE2IiwKICAiZmQwMDo6LzgiLApdCgpwYXNzX3NlYXJ4bmdfb3JnID0gdHJ1ZQo= | base64 -d > /etc/user/data/openwebui/searxng/limiter.toml && mkdir -p /etc/user/data/openwebui/searxng-nginx && printf %s IyBSZXZlcnNlIHByb3h5IGluIGZyb250IG9mIFNlYXJYTkcuCiMgU2V0cyBYLVJlYWwtSVAgLyBYLUZvcndhcmRlZC1Gb3Igc28gU2VhclhORyBQcm94eUZpeCBsb2dzIG5vIGVycm9yLgp1cHN0cmVhbSBzZWFyeG5nIHsKICAgIHNlcnZlciBvcGVud2VidWlzZWFyeG5nLWFwcDo4MDgwOwogICAga2VlcGFsaXZlIDMyOwp9CgpzZXJ2ZXIgewogICAgbGlzdGVuIDgwODA7CiAgICBzZXJ2ZXJfbmFtZSBfOwoKICAgIGxvY2F0aW9uIC8gewogICAgICAgIHByb3h5X3Bhc3MgaHR0cDovL3NlYXJ4bmc7CiAgICAgICAgcHJveHlfc2V0X2hlYWRlciBIb3N0ICRob3N0OwogICAgICAgIHByb3h5X3NldF9oZWFkZXIgWC1SZWFsLUlQICRyZW1vdGVfYWRkcjsKICAgICAgICBwcm94eV9zZXRfaGVhZGVyIFgtRm9yd2FyZGVkLUZvciAkcHJveHlfYWRkX3hfZm9yd2FyZGVkX2ZvcjsKICAgICAgICBwcm94eV9zZXRfaGVhZGVyIFgtRm9yd2FyZGVkLVByb3RvICRzY2hlbWU7CiAgICAgICAgcHJveHlfc2V0X2hlYWRlciBYLUZvcndhcmRlZC1Ib3N0ICRob3N0OwogICAgICAgIHByb3h5X2h0dHBfdmVyc2lvbiAxLjE7CiAgICAgICAgcHJveHlfc2V0X2hlYWRlciBDb25uZWN0aW9uICIiOwogICAgICAgIHByb3h5X3JlZGlyZWN0IG9mZjsKICAgICAgICBjbGllbnRfbWF4X2JvZHlfc2l6ZSAxMG07CiAgICB9Cn0K | base64 -d > /etc/user/data/openwebui/searxng-nginx/searxng-upstream.conf", "CMD": "mkdir -p /etc/user/data/openwebui/data && mkdir -p /etc/user/data/openwebui/db && mkdir -p /etc/user/data/openwebui/qdrant && mkdir -p /etc/user/data/openwebui/searxng && mkdir -p /etc/user/data/openwebui/crawl4ai && printf %s c2VydmVyOgogIGJpbmRfYWRkcmVzczogMC4wLjAuMAogIHBvcnQ6IDgwODAKICBsaW1pdGVyOiBmYWxzZQogIHB1YmxpY19pbnN0YW5jZTogZmFsc2UKc2VhcmNoOgogIGZvcm1hdHM6CiAgICAtIGh0bWwKICAgIC0ganNvbgp1aToKICBzdGF0aWNfdXNlX2hhc2g6IHRydWUKdmFsa2V5OgogIHVybDogZmFsc2UKb3V0Z29pbmc6CiAgdXNlcmFnZW50OiBNb3ppbGxhLzUuMCAoV2luZG93cyBOVCAxMC4wOyBXaW42NDsgeDY0KSBBcHBsZVdlYktpdC81MzcuMzYgKEtIVE1MLCBsaWtlIEdlY2tvKSBDaHJvbWUvMTMxLjAuMC4wIFNhZmFyaS81MzcuMzYKdXNlX2RlZmF1bHRfc2V0dGluZ3M6CiAgZW5naW5lczoKICAgIHJlbW92ZToKICAgICAgLSBhaG1pYQogICAgICAtIHRvcmNoCiAgICAgIC0gd2lraWRhdGEK | base64 -d > /etc/user/data/openwebui/searxng/settings.yml && printf %s W2JvdGRldGVjdGlvbl0KCiMgVGhlIHByZWZpeCBkZWZpbmVzIHRoZSBudW1iZXIgb2YgbGVhZGluZyBiaXRzIGluIGFuIGFkZHJlc3MgdGhhdCBhcmUgY29tcGFyZWQKIyB0byBkZXRlcm1pbmUgd2hldGhlciBvciBub3QgYW4gYWRkcmVzcyBpcyBwYXJ0IG9mIGEgKGNsaWVudCkgbmV0d29yay4KaXB2NF9wcmVmaXggPSAzMgppcHY2X3ByZWZpeCA9IDQ4CgojIE5ldHdvcmtzIG9mIHRoZSByZXZlcnNlIHByb3hpZXMgLyBsb2FkIGJhbGFuY2VycyAvIGludGVybmFsIERvY2tlciBnYXRld2F5cyBpbgojIGZyb250IG9mIHRoaXMgaW5zdGFuY2UuIFJlcXVlc3RzIGZyb20gdGhlc2UgbmV0d29ya3MgbWF5IGNhcnJ5CiMgWC1Gb3J3YXJkZWQtRm9yIC8gWC1SZWFsLUlQLCBhbmQgdGhlIHJlYWwgY2xpZW50IElQIGlzIGV4dHJhY3RlZCBmcm9tIHRoZW0uCiMgSW50ZXJuYWwgRG9ja2VyIG5ldHdvcmtzIGFyZSBpbmNsdWRlZCBzbyBhIGZ1dHVyZSByZXZlcnNlIHByb3h5IG9uIHRoaXMgaG9zdAojIGlzIGhhbmRsZWQgY29ycmVjdGx5Lgp0cnVzdGVkX3Byb3hpZXMgPSBbCiAgIjEyNy4wLjAuMC84IiwKICAiOjoxIiwKICAiMTAuMC4wLjAvOCIsCiAgIjE3Mi4xNi4wLjAvMTIiLAogICIxOTIuMTY4LjAuMC8xNiIsCiAgImZkMDA6Oi84IiwKXQoKW2JvdGRldGVjdGlvbi5pcF9saW1pdF0KCmZpbHRlcl9saW5rX2xvY2FsID0gZmFsc2UKbGlua190b2tlbiA9IGZhbHNlCgpbYm90ZGV0ZWN0aW9uLmlwX2xpc3RzXQoKIyBJbnRlcm5hbCAvIGxvY2FsIG5ldHdvcmtzIGFyZSB0cnVzdGVkIGFuZCBuZXZlciByYXRlLWxpbWl0ZWQgb3IgYmxvY2tlZC4KcGFzc19pcCA9IFsKICAiMTI3LjAuMC4wLzgiLAogICI6OjEiLAogICIxMC4wLjAuMC84IiwKICAiMTcyLjE2LjAuMC8xMiIsCiAgIjE5Mi4xNjguMC4wLzE2IiwKICAiZmQwMDo6LzgiLApdCgpwYXNzX3NlYXJ4bmdfb3JnID0gdHJ1ZQo= | base64 -d > /etc/user/data/openwebui/searxng/limiter.toml && mkdir -p /etc/user/data/openwebui/searxng-proxy && printf %s IyBSZXZlcnNlIHByb3h5IGluIGZyb250IG9mIFNlYXJYTkcuCiMgU2V0cyBYLVJlYWwtSVAgLyBYLUZvcndhcmRlZC1Gb3Igc28gU2VhclhORyBQcm94eUZpeCBsb2dzIG5vIGVycm9yLgp1cHN0cmVhbSBzZWFyeG5nIHsKICAgIHNlcnZlciBvcGVud2VidWlzZWFyeG5nLWFwcDo4MDgwOwogICAga2VlcGFsaXZlIDMyOwp9CgpzZXJ2ZXIgewogICAgbGlzdGVuIDgwODA7CiAgICBzZXJ2ZXJfbmFtZSBfOwoKICAgIGxvY2F0aW9uIC8gewogICAgICAgIHByb3h5X3Bhc3MgaHR0cDovL3NlYXJ4bmc7CiAgICAgICAgcHJveHlfc2V0X2hlYWRlciBIb3N0ICRob3N0OwogICAgICAgIHByb3h5X3NldF9oZWFkZXIgWC1SZWFsLUlQICRyZW1vdGVfYWRkcjsKICAgICAgICBwcm94eV9zZXRfaGVhZGVyIFgtRm9yd2FyZGVkLUZvciAkcHJveHlfYWRkX3hfZm9yd2FyZGVkX2ZvcjsKICAgICAgICBwcm94eV9zZXRfaGVhZGVyIFgtRm9yd2FyZGVkLVByb3RvICRzY2hlbWU7CiAgICAgICAgcHJveHlfc2V0X2hlYWRlciBYLUZvcndhcmRlZC1Ib3N0ICRob3N0OwogICAgICAgIHByb3h5X2h0dHBfdmVyc2lvbiAxLjE7CiAgICAgICAgcHJveHlfc2V0X2hlYWRlciBDb25uZWN0aW9uICIiOwogICAgICAgIHByb3h5X3JlZGlyZWN0IG9mZjsKICAgICAgICBjbGllbnRfbWF4X2JvZHlfc2l6ZSAxMG07CiAgICB9Cn0K | base64 -d > /etc/user/data/openwebui/searxng-proxy/searxng-upstream.conf",
"PRE_START": "null", "PRE_START": "null",
"POST_START": "null" "POST_START": "null"
}, },
@@ -126,21 +126,18 @@
{ {
"IMAGE": "nginx:alpine", "IMAGE": "nginx:alpine",
"UPDATE": "true", "UPDATE": "true",
"NAME": "openwebuisearxng-proxy", "NAME": "openwebuiproxy-app",
"MEMORY": "64M", "MEMORY": "64M",
"NETWORK": "openwebui-net", "NETWORK": "openwebui-net",
"SELECTOR": "openwebuisearxng-proxy", "SELECTOR": "openwebuisearxng-proxy",
"VOLUMES": [ "VOLUMES": [
{ {
"SOURCE": "/etc/user/data/openwebui/searxng-nginx", "SOURCE": "/etc/user/data/openwebui/searxng-proxy",
"DEST": "/etc/nginx/conf.d", "DEST": "/etc/nginx/conf.d",
"TYPE": "ro" "TYPE": "ro"
} }
], ],
"EXTRA": "--restart always", "EXTRA": "--restart always",
"DEPEND": [
"openwebuisearxng-app"
],
"START_ON_BOOT": "false", "START_ON_BOOT": "false",
"CMD": "null", "CMD": "null",
"PRE_START": "null", "PRE_START": "null",
openwebui/template.json
+1 -1
View File
@@ -143,7 +143,7 @@
{ {
"description": "Web", "description": "Web",
"key": "SEARXNG_QUERY_URL", "key": "SEARXNG_QUERY_URL",
"value": "http://openwebuisearxng-proxy:8080/search", "value": "http://openwebuiproxy-app:8080/search",
"info": "Optional web search engine Searxng, keep it empty if you don't want it", "info": "Optional web search engine Searxng, keep it empty if you don't want it",
"advanced": "true" "advanced": "true"
}, },