summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhanibek Adilbekov2024-03-10 22:45:57 +0500
committerZhanibek Adilbekov2024-03-10 22:45:57 +0500
commitaf1add9a609c06cfcfa955a4684f0808b8a54504 (patch)
treebb55cd8a374d3f4185912a589107a1b74a065054
parent08dadd8ef473a8a9caf7394e5450f6da66acb50f (diff)
downloadaur-af1add9a609c06cfcfa955a4684f0808b8a54504.tar.gz
refactor: create cache dir if it does not exist
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
-rwxr-xr-xpixelserv-ca-init.sh24
3 files changed, 21 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c25bef9d125c..a44148e0fa0d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -12,7 +12,7 @@ pkgbase = pixelserv-tls
source = pixelserv-tls.service
source = build-fix.patch
b2sums = cec2a713c21b98083c5f00b05a49dae50d5f16f6b1014f0635558ce26d29c11e64a1178fc687234810d33267b5d30d1bea2ce0be9407d102a7b44f4501d92eaa
- b2sums = 9e482f626c9e2451c29ee7d384b984d4d7a1fc580e5b343ba92d5301009676c336d53b0b409bbdde162f8a4f80f3a3b14fc27a801fba7f84e1a1961d80e759c0
+ b2sums = ee9bb5c257105424398b7478b291094be02bd7d0b410470395da76d23cc02abe85b4c4a6511989b8e2526288a413a79118db8977064a4187d542c2e575c31c2a
b2sums = d5a7f2c193de9685e8daffedee45619d08b3192c53152302fcd9d97d75338a9906030c3511131872f4d4c7946e1d6e9e5dbb1d9918e3d6c011c0b6278e8b1118
b2sums = 2a9c40c6749a3c72b87267a6e6c0d076378a756176aad5fe964202d6a6fb21150b9a54564ec4259103b35223e2cdaf855c886648368be2ca7c2dd504bf58f6e1
diff --git a/PKGBUILD b/PKGBUILD
index e9168da99e5e..35dce747f85a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,7 @@ source=(
"pixelserv-tls.service"
"build-fix.patch")
b2sums=('cec2a713c21b98083c5f00b05a49dae50d5f16f6b1014f0635558ce26d29c11e64a1178fc687234810d33267b5d30d1bea2ce0be9407d102a7b44f4501d92eaa'
- '9e482f626c9e2451c29ee7d384b984d4d7a1fc580e5b343ba92d5301009676c336d53b0b409bbdde162f8a4f80f3a3b14fc27a801fba7f84e1a1961d80e759c0'
+ 'ee9bb5c257105424398b7478b291094be02bd7d0b410470395da76d23cc02abe85b4c4a6511989b8e2526288a413a79118db8977064a4187d542c2e575c31c2a'
'd5a7f2c193de9685e8daffedee45619d08b3192c53152302fcd9d97d75338a9906030c3511131872f4d4c7946e1d6e9e5dbb1d9918e3d6c011c0b6278e8b1118'
'2a9c40c6749a3c72b87267a6e6c0d076378a756176aad5fe964202d6a6fb21150b9a54564ec4259103b35223e2cdaf855c886648368be2ca7c2dd504bf58f6e1')
diff --git a/pixelserv-ca-init.sh b/pixelserv-ca-init.sh
index 74d7066277be..5d58f5875843 100755
--- a/pixelserv-ca-init.sh
+++ b/pixelserv-ca-init.sh
@@ -1,10 +1,24 @@
-#!/bin/sh
+#!/bin/env bash
+
+# target directory
+TARGET_DIR='/var/cache/pixelserv'
+
+# ensure the target directory exists
+if [[ ! -d "$TARGET_DIR" ]]; then
+ sudo mkdir -pv "$TARGET_DIR"
+fi
+
+# check the ownership of the directory
+if [[ "$(stat -c '%U' "$TARGET_DIR")" != 'nobody' ]]; then
+ sudo chown -v nobody:nobody "$TARGET_DIR"
+fi
# generate cert
-sudo -u nobody openssl genrsa -out /var/cache/pixelserv/ca.key 1024
-sudo -u nobody openssl req -key /var/cache/pixelserv/ca.key -new -x509 -days 3650 -sha256 \
- -extensions v3_ca -out /var/cache/pixelserv/ca.crt -subj "/CN=Pixelserv CA"
+sudo -u nobody openssl genrsa -out "$TARGET_DIR"/ca.key 2048
+sudo -u nobody openssl req -key "$TARGET_DIR"/ca.key -new -x509 -days 3650 -sha256 \
+ -extensions v3_ca -config /etc/ssl/openssl.cnf \
+ -out "$TARGET_DIR"/ca.crt -subj "/CN=Pixelserv CA"
# trust cert
-sudo cp /var/cache/pixelserv/ca.crt /usr/share/ca-certificates/trust-source/anchors/ca.pixelserv.crt
+sudo cp "$TARGET_DIR"/ca.crt /usr/share/ca-certificates/trust-source/anchors/ca.pixelserv.crt
sudo trust extract-compat