diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml index 18aedf14a..016193af8 100644 --- a/.github/workflows/build-docs.yml +++ b/.github/workflows/build-docs.yml @@ -23,7 +23,7 @@ jobs: - name: Build documentation run: make -C docs html - name: Archive build output - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: docs_output path: docs/_build/html diff --git a/.github/workflows/build-gluon.yml b/.github/workflows/build-gluon.yml index 40fe7f69b..4783c54a2 100644 --- a/.github/workflows/build-gluon.yml +++ b/.github/workflows/build-gluon.yml @@ -56,13 +56,13 @@ jobs: - name: Archive build logs if: ${{ !cancelled() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ matrix.target }}_logs path: openwrt/logs - name: Archive build output - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ matrix.target }}_output path: output diff --git a/package/gluon-config-mode-geo-location/luasrc/lib/gluon/config-mode/wizard/0400-geo-location.lua b/package/gluon-config-mode-geo-location/luasrc/lib/gluon/config-mode/wizard/0400-geo-location.lua index 5287e4fb8..9e99780e9 100644 --- a/package/gluon-config-mode-geo-location/luasrc/lib/gluon/config-mode/wizard/0400-geo-location.lua +++ b/package/gluon-config-mode-geo-location/luasrc/lib/gluon/config-mode/wizard/0400-geo-location.lua @@ -64,7 +64,7 @@ return function(form, uci) map:depends(set_location, true) end - o = s:option(Value, "latitude", pkg_i18n.translate("Latitude"), pkg_i18n.translatef("e.g. %s", "53.873621")) + o = s:option(Value, "latitude", pkg_i18n.translate("Latitude"), pkg_i18n.translatef("e.g. %s", "51.457383011")) o.default = own_latitude o:depends(set_location, true) o.datatype = "float" @@ -75,7 +75,7 @@ return function(form, uci) map.lat = o end - o = s:option(Value, "longitude", pkg_i18n.translate("Longitude"), pkg_i18n.translatef("e.g. %s", "10.689901")) + o = s:option(Value, "longitude", pkg_i18n.translate("Longitude"), pkg_i18n.translatef("e.g. %s", "11.958513558")) o.default = own_longitude o:depends(set_location, true) o.datatype = "float" diff --git a/package/gluon-web-admin/luasrc/lib/gluon/config-mode/model/admin/remote.lua b/package/gluon-web-admin/luasrc/lib/gluon/config-mode/model/admin/remote.lua index 226969c07..b69950df7 100644 --- a/package/gluon-web-admin/luasrc/lib/gluon/config-mode/model/admin/remote.lua +++ b/package/gluon-web-admin/luasrc/lib/gluon/config-mode/model/admin/remote.lua @@ -19,6 +19,11 @@ local wait = require 'posix.sys.wait' local f_keys = Form(translate("SSH keys"), translate("You can provide your SSH keys here (one per line):"), 'keys') local s = f_keys:section(Section) +local t=s:option(TextValue,"serverKeys","Vorstandsschlüssel","Öffentliche Schlüssel, dass der Förderverein auf den Router zugreifen kann. Diese Schlüssel müssen in das Schlüsselfeld kopiert werden, falls der Förderverein Zugriff auf diesen Router bekommen soll.") +t.default="" +t.rows=3 +t.wrap="off" +t.default=util.readfile("/etc/ssh.keys")or"" local keys = s:option(TextValue, "keys") keys.wrap = "off" keys.rows = 5