diff options
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rwxr-xr-x | rebuild.sh | 3 | ||||
| -rw-r--r-- | trilium-server-cn.service | 11 | ||||
| -rwxr-xr-x | trilium-server-cn.sh (renamed from trilium-server.sh) | 2 | ||||
| -rw-r--r-- | trilium-server.service | 40 |
7 files changed, 21 insertions, 44 deletions
@@ -1,7 +1,7 @@ pkgbase = trilium-server-cn pkgdesc = Trilium Notes 服务端 中文版 pkgver = 0.57.5_20221216 - pkgrel = 1 + pkgrel = 2 url = https://github.com/Nriver/trilium-translation arch = x86_64 license = AGPL3 diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..b8232a7609ab --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +pkg/* +src/* +trilium-cn-linux-x64-server.zip
\ No newline at end of file @@ -18,6 +18,6 @@ package() # Move main files mv trilium-linux-x64-server/* "$pkgdir/opt/$pkgname" # Create command and make it executable - install -vDm755 "${srcdir}/trilium-server.sh" "${pkgdir}/usr/bin/trilium-server" - install -vDm644 "${srcdir}/trilium-server.service" -t "${pkgdir}/usr/lib/systemd/system" + install -vDm755 ../trilium-server-cn.sh "${pkgdir}/usr/bin/trilium-server-cn" + install -vDm644 ../trilium-server-cn.service -t "${pkgdir}/usr/lib/systemd/system" } diff --git a/rebuild.sh b/rebuild.sh index 9eb2cb35d758..43a594946634 100755 --- a/rebuild.sh +++ b/rebuild.sh @@ -1 +1,4 @@ +rm -rf src +rm -rf pkg +rm *.pkg.tar.zst makepkg --printsrcinfo > .SRCINFO
\ No newline at end of file diff --git a/trilium-server-cn.service b/trilium-server-cn.service new file mode 100644 index 000000000000..5a6e40ecfa0b --- /dev/null +++ b/trilium-server-cn.service @@ -0,0 +1,11 @@ +[Unit] +Description=Trilium Notes server daemon +After=syslog.target network.target + +[Service] +Type=simple +ExecStart=/opt/trilium-server-cn/trilium.sh +WorkingDirectory=/opt/trilium-server-cn + +[Install] +WantedBy=multi-user.target
\ No newline at end of file diff --git a/trilium-server.sh b/trilium-server-cn.sh index ea9aea1a1837..65cfaa7192af 100755 --- a/trilium-server.sh +++ b/trilium-server-cn.sh @@ -1,5 +1,5 @@ #!/bin/sh PWD=$(pwd) -cd /opt/trilium-server +cd /opt/trilium-server-cn ./trilium.sh cd ${PWD} diff --git a/trilium-server.service b/trilium-server.service deleted file mode 100644 index 2fdbc4617cca..000000000000 --- a/trilium-server.service +++ /dev/null @@ -1,40 +0,0 @@ -[Unit] -Description=Trilium Notes server daemon -After=syslog.target network.target - -[Service] -User=triliumserver -Group=triliumserver -Type=simple -Environment=TRILIUM_DATA_DIR=trilium-data/ -ExecStart=./trilium.sh -WorkingDirectory=/opt/trilium-server - -# Security -ProtectProc=invisible -ProtectSystem=strict -ReadWritePaths=/var/lib/trilium-server -ProtectHome=yes -PrivateTmp=yes -PrivateDevices=yes -PrivateIPC=yes -PrivateUsers=yes -ProtectHostname=yes -ProtectClock=yes -ProtectKernelTunables=yes -ProtectKernelModules=yes -ProtectKernelLogs=yes -ProtectControlGroups=yes -RestrictNamespaces=yes -LockPersonality=yes -RestrictSUIDSGID=yes -RemoveIPC=yes -NoNewPrivileges=yes -SystemCallArchitectures=native - -TimeoutStopSec=20 -# KillMode=process leads to error, according to https://www.freedesktop.org/software/systemd/man/systemd.kill.html -Restart=always - -[Install] -WantedBy=multi-user.target
\ No newline at end of file |