From 310466fa9b1690368d55a0e908fb81773c9b4951 Mon Sep 17 00:00:00 2001
From: Chris N <c.noseworthy@gmail.com>
Date: Mon, 25 Nov 2024 18:07:39 -0500
Subject: [PATCH 1/8] Fix issue with Vikunja update wiping DB and files
---
install/vikunja-install.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/install/vikunja-install.sh b/install/vikunja-install.sh
index e5b0d9f1960..617d875f658 100644
--- a/install/vikunja-install.sh
+++ b/install/vikunja-install.sh
@@ -22,11 +22,14 @@ $STD apt-get install -y \
msg_ok "Installed Dependencies"
msg_info "Setup Vikunja (Patience)"
+CONFIG_FILE=/etc/vikunja/config.yml
cd /opt
RELEASE=$(curl -s https://dl.vikunja.io/vikunja/ | grep -oP 'href="/vikunja/\K[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -n 1)
wget -q "https://dl.vikunja.io/vikunja/$RELEASE/vikunja-$RELEASE-amd64.deb"
$STD dpkg -i vikunja-$RELEASE-amd64.deb
-sudo sed -i 's/^ timezone: .*/ timezone: UTC/' /etc/vikunja/config.yml
+sudo sed -i 's/^ timezone: .*/ timezone: UTC/' $CONFIG_FILE
+sed -i 's|"./vikunja.db"|"/etc/vikunja/vikunja.db"|' $CONFIG_FILE
+sed -i 's|./files|/etc/vikunja/files|' $CONFIG_FILE
systemctl start vikunja.service
echo "${RELEASE}" >/opt/${APPLICATION}_version.txt
msg_ok "Installed Vikunja"
From 379229f89346ab001cbba04e4c311daba91530b0 Mon Sep 17 00:00:00 2001
From: vhsdream <punk.sand7393@fastmail.com>
Date: Mon, 25 Nov 2024 19:06:47 -0500
Subject: [PATCH 2/8] use a single sed command
---
install/vikunja-install.sh | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/install/vikunja-install.sh b/install/vikunja-install.sh
index 617d875f658..d15479e252a 100644
--- a/install/vikunja-install.sh
+++ b/install/vikunja-install.sh
@@ -22,14 +22,11 @@ $STD apt-get install -y \
msg_ok "Installed Dependencies"
msg_info "Setup Vikunja (Patience)"
-CONFIG_FILE=/etc/vikunja/config.yml
cd /opt
RELEASE=$(curl -s https://dl.vikunja.io/vikunja/ | grep -oP 'href="/vikunja/\K[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -n 1)
wget -q "https://dl.vikunja.io/vikunja/$RELEASE/vikunja-$RELEASE-amd64.deb"
$STD dpkg -i vikunja-$RELEASE-amd64.deb
-sudo sed -i 's/^ timezone: .*/ timezone: UTC/' $CONFIG_FILE
-sed -i 's|"./vikunja.db"|"/etc/vikunja/vikunja.db"|' $CONFIG_FILE
-sed -i 's|./files|/etc/vikunja/files|' $CONFIG_FILE
+sed -i 's|^ timezone: .*| timezone: UTC|; s|"./vikunja.db"|"/etc/vikunja/vikunja.db"|; s|./files|/etc/vikunja/files|' /etc/vikunja/config.yml
systemctl start vikunja.service
echo "${RELEASE}" >/opt/${APPLICATION}_version.txt
msg_ok "Installed Vikunja"
From 4b8f1ed9674e15ddc87d6f3e0a2402ea663d0d97 Mon Sep 17 00:00:00 2001
From: vhsdream <punk.sand7393@fastmail.com>
Date: Mon, 25 Nov 2024 19:17:26 -0500
Subject: [PATCH 3/8] change build.func to test install script
---
misc/build.func | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/misc/build.func b/misc/build.func
index aee3366a8b8..57d346ab4af 100644
--- a/misc/build.func
+++ b/misc/build.func
@@ -666,7 +666,7 @@ http://dl-cdn.alpinelinux.org/alpine/latest-stable/community
EOF'
pct exec "$CTID" -- ash -c "apk add bash >/dev/null"
fi
- lxc-attach -n "$CTID" -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/install/$var_install.sh)" || exit
+ lxc-attach -n "$CTID" -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/vhsdream/ProxmoxVE/vikunja/install/$var_install.sh)" || exit
}
From 4de09d7c2ba2b074eb51b5dedde95f9292cdac02 Mon Sep 17 00:00:00 2001
From: vhsdream <punk.sand7393@fastmail.com>
Date: Mon, 25 Nov 2024 19:32:47 -0500
Subject: [PATCH 4/8] another small change in order to test vikunja fix
---
misc/build.func | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/misc/build.func b/misc/build.func
index 57d346ab4af..44238c584f2 100644
--- a/misc/build.func
+++ b/misc/build.func
@@ -572,7 +572,7 @@ build_container() {
if [ "$var_os" == "alpine" ]; then
export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/alpine-install.func)"
else
- export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/install.func)"
+ export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/vhsdream/ProxmoxVE/vikunja/misc/install.func)"
fi
export CACHER="$APT_CACHER"
export CACHER_IP="$APT_CACHER_IP"
From 46f32c907194c6ff67f8ee99c6d811e24bd6c200 Mon Sep 17 00:00:00 2001
From: vhsdream <punk.sand7393@fastmail.com>
Date: Mon, 25 Nov 2024 19:45:51 -0500
Subject: [PATCH 5/8] another change
---
ct/vikunja.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ct/vikunja.sh b/ct/vikunja.sh
index 5428bd5c76d..288403f9b70 100644
--- a/ct/vikunja.sh
+++ b/ct/vikunja.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-source <(curl -s https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/build.func)
+source <(curl -s https://raw.githubusercontent.com/vhsdream/ProxmoxVE/vikunja/misc/build.func)
# Copyright (c) 2021-2024 community-scripts ORG
# Author: MickLesk (Canbiz)
# License: MIT
From 3b6ba9ad63dde9f69ca9c027b1413f856a96c8fa Mon Sep 17 00:00:00 2001
From: vhsdream <punk.sand7393@fastmail.com>
Date: Mon, 25 Nov 2024 19:58:54 -0500
Subject: [PATCH 6/8] revert URL modification after successful test
---
ct/vikunja.sh | 2 +-
misc/build.func | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ct/vikunja.sh b/ct/vikunja.sh
index 288403f9b70..5428bd5c76d 100644
--- a/ct/vikunja.sh
+++ b/ct/vikunja.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-source <(curl -s https://raw.githubusercontent.com/vhsdream/ProxmoxVE/vikunja/misc/build.func)
+source <(curl -s https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/build.func)
# Copyright (c) 2021-2024 community-scripts ORG
# Author: MickLesk (Canbiz)
# License: MIT
diff --git a/misc/build.func b/misc/build.func
index 44238c584f2..aee3366a8b8 100644
--- a/misc/build.func
+++ b/misc/build.func
@@ -572,7 +572,7 @@ build_container() {
if [ "$var_os" == "alpine" ]; then
export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/alpine-install.func)"
else
- export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/vhsdream/ProxmoxVE/vikunja/misc/install.func)"
+ export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/install.func)"
fi
export CACHER="$APT_CACHER"
export CACHER_IP="$APT_CACHER_IP"
@@ -666,7 +666,7 @@ http://dl-cdn.alpinelinux.org/alpine/latest-stable/community
EOF'
pct exec "$CTID" -- ash -c "apk add bash >/dev/null"
fi
- lxc-attach -n "$CTID" -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/vhsdream/ProxmoxVE/vikunja/install/$var_install.sh)" || exit
+ lxc-attach -n "$CTID" -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/install/$var_install.sh)" || exit
}
From 89362afc42f1b6b9a803764316121485bd66db0d Mon Sep 17 00:00:00 2001
From: vhsdream <67816022+vhsdream@users.noreply.github.com>
Date: Tue, 26 Nov 2024 08:08:41 -0500
Subject: [PATCH 7/8] Update vikunja-install.sh
---
install/vikunja-install.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/install/vikunja-install.sh b/install/vikunja-install.sh
index d15479e252a..a061132c028 100644
--- a/install/vikunja-install.sh
+++ b/install/vikunja-install.sh
@@ -26,7 +26,9 @@ cd /opt
RELEASE=$(curl -s https://dl.vikunja.io/vikunja/ | grep -oP 'href="/vikunja/\K[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -n 1)
wget -q "https://dl.vikunja.io/vikunja/$RELEASE/vikunja-$RELEASE-amd64.deb"
$STD dpkg -i vikunja-$RELEASE-amd64.deb
-sed -i 's|^ timezone: .*| timezone: UTC|; s|"./vikunja.db"|"/etc/vikunja/vikunja.db"|; s|./files|/etc/vikunja/files|' /etc/vikunja/config.yml
+sed -i 's|^ timezone: .*| timezone: UTC|
+ s|"./vikunja.db"|"/etc/vikunja/vikunja.db"|
+ s|./files|/etc/vikunja/files|' /etc/vikunja/config.yml
systemctl start vikunja.service
echo "${RELEASE}" >/opt/${APPLICATION}_version.txt
msg_ok "Installed Vikunja"
From 446e01f67aa976d25d87bcc95ae9cb1af7397c56 Mon Sep 17 00:00:00 2001
From: vhsdream <punk.sand7393@fastmail.com>
Date: Tue, 26 Nov 2024 11:00:12 -0500
Subject: [PATCH 8/8] update vikunja-install.sh
---
install/vikunja-install.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/install/vikunja-install.sh b/install/vikunja-install.sh
index a061132c028..de52efc62ac 100644
--- a/install/vikunja-install.sh
+++ b/install/vikunja-install.sh
@@ -26,9 +26,9 @@ cd /opt
RELEASE=$(curl -s https://dl.vikunja.io/vikunja/ | grep -oP 'href="/vikunja/\K[0-9]+\.[0-9]+\.[0-9]+' | sort -V | tail -n 1)
wget -q "https://dl.vikunja.io/vikunja/$RELEASE/vikunja-$RELEASE-amd64.deb"
$STD dpkg -i vikunja-$RELEASE-amd64.deb
-sed -i 's|^ timezone: .*| timezone: UTC|
- s|"./vikunja.db"|"/etc/vikunja/vikunja.db"|
- s|./files|/etc/vikunja/files|' /etc/vikunja/config.yml
+sed -i 's|^ timezone: .*| timezone: UTC|' /etc/vikunja/config.yml
+sed -i 's|"./vikunja.db"|"/etc/vikunja/vikunja.db"|' /etc/vikunja/config.yml
+sed -i 's|./files|/etc/vikunja/files|' /etc/vikunja/config.yml
systemctl start vikunja.service
echo "${RELEASE}" >/opt/${APPLICATION}_version.txt
msg_ok "Installed Vikunja"