Skip to content

Commit a8e1d26

Browse files
mrmarkuzmrmarkuz
committed
Update ui libs and fix systemd vars and renovate
1 parent b095cf0 commit a8e1d26

7 files changed

Lines changed: 83 additions & 28 deletions

File tree

‎imageroot/actions/clone-module/50Traefik‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import agent
99
import os
1010

1111
configure_retval = agent.tasks.run(agent_id=os.environ['AGENT_ID'], action='configure-module', data={
12-
"lets_encrypt": os.environ["TRAEFIK_LETS_ENCRYPT"] == "True",
1312
"host": os.environ["TRAEFIK_HOST"],
1413
"http2https": os.environ["TRAEFIK_HTTP2HTTPS"] == "True",
1514
})

‎imageroot/actions/restore-module/50traefik‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ request = json.load(sys.stdin)
1414
renv = request['environment']
1515

1616
configure_retval = agent.tasks.run(agent_id=os.environ['AGENT_ID'], action='configure-module', data={
17-
"lets_encrypt": renv["TRAEFIK_LETS_ENCRYPT"] == "True",
1817
"host": renv["TRAEFIK_HOST"],
1918
"http2https": renv["TRAEFIK_HTTP2HTTPS"] == "True",
2019
})

‎imageroot/systemd/user/onlyoffice-app.service‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@ After=onlyoffice.service
1010

1111
[Service]
1212
Environment=PODMAN_SYSTEMD_UNIT=%n
13-
EnvironmentFile=%S/state/environment
14-
WorkingDirectory=%S/state
13+
EnvironmentFile=%E/state/environment
14+
WorkingDirectory=%E/state
1515
Restart=always
1616
TimeoutStopSec=70
1717
#ExecStartPre=/usr/bin/podman volume prune --force
1818
ExecStartPre=/bin/rm -f %t/onlyoffice-app.pid %t/onlyoffice-app.ctr-id
1919
ExecStart=/usr/bin/podman run --conmon-pidfile %t/onlyoffice-app.pid \
2020
--cidfile %t/onlyoffice-app.ctr-id --cgroups=no-conmon \
2121
--pod-id-file %t/onlyoffice.pod-id --replace -d --name onlyoffice-app \
22-
--env-file=%S/state/environment \
22+
--env-file=%E/state/environment \
2323
--volume onlyoffice-log:/var/log/onlyoffice:Z \
2424
--volume onlyoffice-data:/var/www/onlyoffice/Data:Z \
2525
--volume onlyoffice-lib:/var/lib/onlyoffice:Z \

‎imageroot/systemd/user/onlyoffice.service‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Before=onlyoffice-app.service
1515

1616
[Service]
1717
Environment=PODMAN_SYSTEMD_UNIT=%n
18-
EnvironmentFile=-%S/state/environment
18+
EnvironmentFile=-%E/state/environment
1919
Restart=always
2020
TimeoutStopSec=70
2121
ExecStartPre=/bin/rm -f %t/onlyoffice.pid %t/onlyoffice.pod-id

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"dependencies": {
3-
"@nethserver/ns8-ui-lib": "^1.0.0"
3+
"@nethserver/ns8-ui-lib": "^1.12.4"
44
}
55
}

‎renovate.json‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,6 @@
11
{
2-
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3-
"extends": [
4-
"config:recommended"
5-
],
6-
"ignorePaths": [
7-
"**/ui/**",
8-
"**/.devcontainer/**"
9-
],
10-
"customManagers": [
11-
{
12-
"customType": "regex",
13-
"managerFilePatterns": [
14-
"/build-images.sh/"
15-
],
16-
"matchStrings": [
17-
"docker\\.io/onlyoffice/documentserver:(?<currentValue>[-0-9\\.a-z]+)"
18-
],
19-
"datasourceTemplate": "docker",
20-
"depNameTemplate": "onlyoffice/documentserver"
21-
}
22-
]
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": [
4+
"local>NethServer/.github:ns8-automerge"
5+
]
236
}

‎yarn.lock‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
2+
# yarn lockfile v1
3+
4+
5+
"@babel/runtime@^7.21.0":
6+
version "7.29.7"
7+
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.29.7.tgz#12022450c45a4da6d8d8287b18a4ff2ddb23f768"
8+
integrity sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==
9+
10+
"@nethserver/ns8-ui-lib@^1.12.4":
11+
version "1.12.4"
12+
resolved "https://registry.yarnpkg.com/@nethserver/ns8-ui-lib/-/ns8-ui-lib-1.12.4.tgz#8342890fdb6e3e589fb62297b0ffda939fc3ade9"
13+
integrity sha512-lGlndnoKh/DHf/iSQgwiusRrnRCJC6H40MKTRzr9YRaX35zignTpKE55FfgBp9uhjtTbOMZlyYdq1rXqdw1hfA==
14+
dependencies:
15+
"@rollup/plugin-json" "^4.1.0"
16+
core-js "^3.15.2"
17+
date-fns "^2.23.0"
18+
date-fns-tz "^1.1.6"
19+
vue-date-fns "^2.0.1"
20+
21+
"@rollup/plugin-json@^4.1.0":
22+
version "4.1.0"
23+
resolved "https://registry.yarnpkg.com/@rollup/plugin-json/-/plugin-json-4.1.0.tgz#54e09867ae6963c593844d8bd7a9c718294496f3"
24+
integrity sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==
25+
dependencies:
26+
"@rollup/pluginutils" "^3.0.8"
27+
28+
"@rollup/pluginutils@^3.0.8":
29+
version "3.1.0"
30+
resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b"
31+
integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==
32+
dependencies:
33+
"@types/estree" "0.0.39"
34+
estree-walker "^1.0.1"
35+
picomatch "^2.2.2"
36+
37+
"@types/estree@0.0.39":
38+
version "0.0.39"
39+
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
40+
integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
41+
42+
core-js@^3.15.2:
43+
version "3.49.0"
44+
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.49.0.tgz#8b4d520ac034311fa21aa616f017ada0e0dbbddd"
45+
integrity sha512-es1U2+YTtzpwkxVLwAFdSpaIMyQaq0PBgm3YD1W3Qpsn1NAmO3KSgZfu+oGSWVu6NvLHoHCV/aYcsE5wiB7ALg==
46+
47+
date-fns-tz@^1.1.6:
48+
version "1.3.8"
49+
resolved "https://registry.yarnpkg.com/date-fns-tz/-/date-fns-tz-1.3.8.tgz#083e3a4e1f19b7857fa0c18deea6c2bc46ded7b9"
50+
integrity sha512-qwNXUFtMHTTU6CFSFjoJ80W8Fzzp24LntbjFFBgL/faqds4e5mo9mftoRLgr3Vi1trISsg4awSpYVsOQCRnapQ==
51+
52+
date-fns@^2.0.0, date-fns@^2.23.0:
53+
version "2.30.0"
54+
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0"
55+
integrity sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==
56+
dependencies:
57+
"@babel/runtime" "^7.21.0"
58+
59+
estree-walker@^1.0.1:
60+
version "1.0.1"
61+
resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
62+
integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
63+
64+
picomatch@^2.2.2:
65+
version "2.3.2"
66+
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.2.tgz#5a942915e26b372dc0f0e6753149a16e6b1c5601"
67+
integrity sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==
68+
69+
vue-date-fns@^2.0.1:
70+
version "2.0.2"
71+
resolved "https://registry.yarnpkg.com/vue-date-fns/-/vue-date-fns-2.0.2.tgz#dc548041e85e49582ac429df1a44834bfa29ba55"
72+
integrity sha512-XHd2oYZY0AfWJohCwREhvfziJdiUHit6HYKUPTyvx5wDUaFA4TWDdkFp78IIrn0nl86oTGM1/5yXtNvqYXL5ew==
73+
dependencies:
74+
date-fns "^2.0.0"

0 commit comments

Comments
 (0)