CHANGELOG.md

@@ -17,20 +17,6 @@ All LXC instances created using this repository come pre-installed with Midnight
 Do not break established syntax in this file, as it is automatically updated by a Github Workflow
 
 
-## 2025-01-22
-
-### Changed
-
-### 🚀 Updated Scripts
-
-- Tweak: LubeLogger Script Upcoming Changes 1.4.3 [@JcMinarro](https://github.com/JcMinarro) ([#1656](https://github.com/community-scripts/ProxmoxVE/pull/1656))
-- Fix: SQL Server 2022 Install [@MickLesk](https://github.com/MickLesk) ([#1669](https://github.com/community-scripts/ProxmoxVE/pull/1669))
-
-### 🌐 Website
-
-- Add Docker-VM to Containers & Docker Category [@thost96](https://github.com/thost96) ([#1667](https://github.com/community-scripts/ProxmoxVE/pull/1667))
-- Moving SQL Server 2022 to database category [@CamronBorealis](https://github.com/CamronBorealis) ([#1659](https://github.com/community-scripts/ProxmoxVE/pull/1659))
-
 ## 2025-01-21
 
 ### Changed

ct/lubelogger.sh

@@ -42,17 +42,14 @@ function update_script() {
     msg_info "Updating ${APP} to v${RELEASE}"
     cd /opt
     wget -q https://github.com/hargata/lubelog/releases/download/v${RELEASE}/LubeLogger_v${RELEASE_TRIMMED}_linux_x64.zip
-    mkdir -p /tmp/lubeloggerData/data
+    mkdir -p /tmp/lubeloggerData/wwwroot
     cp /opt/lubelogger/appsettings.json /tmp/lubeloggerData/appsettings.json
-    cp -r /opt/lubelogger/data/ /tmp/lubeloggerData/
+    cp -r /opt/lubelogger/config /tmp/lubeloggerData/
-
+    cp -r /opt/lubelogger/data /tmp/lubeloggerData/
-    # Lubelogger has moved multiples folders to the 'data' folder, and we need to move them before the update to keep the user data
+    [[ -e /opt/lubelogger/wwwroot/translations ]] && cp -r /opt/lubelogger/wwwroot/translations /tmp/lubeloggerData/wwwroot/
-    # Github Discussion: https://github.com/hargata/lubelog/discussions/787
+    [[ -e /opt/lubelogger/wwwroot/documents ]] && cp -r /opt/lubelogger/wwwroot/documents /tmp/lubeloggerData/wwwroot/
-    [[ -e /opt/lubelogger/config ]] && cp -r /opt/lubelogger/config /tmp/lubeloggerData/data/
+    [[ -e /opt/lubelogger/wwwroot/images ]] && cp -r /opt/lubelogger/wwwroot/images /tmp/lubeloggerData/wwwroot/
-    [[ -e /opt/lubelogger/wwwroot/translations ]] && cp -r /opt/lubelogger/wwwroot/translations /tmp/lubeloggerData/data/
+    [[ -e /opt/lubelogger/wwwroot/temp ]] && cp -r /opt/lubelogger/wwwroot/temp /tmp/lubeloggerData/wwwroot/
-    [[ -e /opt/lubelogger/wwwroot/documents ]] && cp -r /opt/lubelogger/wwwroot/documents /tmp/lubeloggerData/data/
-    [[ -e /opt/lubelogger/wwwroot/images ]] && cp -r /opt/lubelogger/wwwroot/images /tmp/lubeloggerData/data/
-    [[ -e /opt/lubelogger/wwwroot/temp ]] && cp -r /opt/lubelogger/wwwroot/temp /tmp/lubeloggerData/data/
     [[ -e /opt/lubelogger/log ]] && cp -r /opt/lubelogger/log /tmp/lubeloggerData/
     rm -rf /opt/lubelogger
     unzip -qq LubeLogger_v${RELEASE_TRIMMED}_linux_x64.zip -d lubelogger

install/actualbudget-install.sh

@@ -37,11 +37,12 @@ $STD npm install --global yarn
 msg_ok "Installed Node.js"
 
 msg_info "Installing Actual Budget"
-cd /opt
 RELEASE=$(curl -s https://api.github.com/repos/actualbudget/actual/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
-wget -q https://github.com/actualbudget/actual-server/archive/refs/tags/v${RELEASE}.tar.gz
+cd /opt
-tar -xzf v${RELEASE}.tar.gz
+$STD git clone https://github.com/actualbudget/actual-server.git /opt/actualbudget
-mv *ctual-server-* /opt/actualbudget
+#$STD curl -L -o actual-server.tar.gz https://github.com/actualbudget/actual-server/archive/refs/tags/v${RELEASE}.tar.gz
+#$STD tar -xzvf v${RELEASE}.tar.gz
+#mv *ctual-server-* /opt/actualbudget
 mkdir -p /opt/actualbudget/server-files
 mkdir -p /opt/actualbudget-data
 chown -R root:root /opt/actualbudget/server-files

install/sqlserver2022-install.sh

@@ -22,26 +22,14 @@ $STD apt install -y \
 	coreutils
 msg_ok "Installed Dependencies"
 
-msg_info "Setup SQL Server 2022"
+msg_info "Get SQL Server 2022 Repository"
-$STD curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor -o /usr/share/keyrings/microsoft-prod.gpg
+mkdir -p /etc/apt/keyrings
-$STD curl https://packages.microsoft.com/keys/microsoft.asc | tee /etc/apt/trusted.gpg.d/microsoft.asc
+curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor -o /etc/apt/keyrings/microsoft-prod.gpg
-$STD curl -fsSL https://packages.microsoft.com/config/ubuntu/22.04/mssql-server-2022.list | tee /etc/apt/sources.list.d/mssql-server-2022.list
+echo "deb [signed-by=/etc/apt/keyrings/microsoft-prod.gpg] https://packages.microsoft.com/config/ubuntu/22.04/mssql-server-2022.list main" >/etc/apt/sources.list.d/mssql-server-2022.list
 $STD apt-get clean *
 $STD apt-get update -y
 $STD apt-get install -y mssql-server
-msg_ok "Setup Server 2022"
+msg_ok "Get SQL Server 2022 Repository"
-
-msg_info "Installing SQL Server Tools"
-export DEBIAN_FRONTEND=noninteractive
-curl https://packages.microsoft.com/keys/microsoft.asc | tee /etc/apt/trusted.gpg.d/microsoft.asc
-curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list | tee /etc/apt/sources.list.d/mssql-release.list
-$STD apt-get update
-$STD apt-get install -y -qq \
-  mssql-tools18 \
-  unixodbc-dev
-echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >> ~/.bash_profile
-source ~/.bash_profile
-msg_ok "Installed SQL Server Tools"
 
 read -r -p "Do you want to run the SQL server setup now? (Later is also possible) <y/N>" prompt
 if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
@@ -50,6 +38,18 @@ else
   msg_ok "Skipping SQL Server setup. You can run it later with '/opt/mssql/bin/mssql-conf setup'."
 fi
 
+msg_info "Installing SQL Server Tools"
+curl -fsSL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor -o /etc/apt/keyrings/microsoft-prod.gpg
+echo "deb [signed-by=/etc/apt/keyrings/microsoft-prod.gpg] https://packages.microsoft.com/config/ubuntu/22.04/prod.list main" \
+  > /etc/apt/sources.list.d/mssql-release.list
+$STD apt-get update
+$STD apt-get install -y \
+  mssql-tools18 \
+  unixodbc-dev
+echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >> ~/.bashrc
+source ~/.bashrc
+msg_ok "Installed SQL Server Tools"
+
 msg_info "Start Service"
 systemctl enable -q --now mssql-server 
 msg_ok "Service started"

json/docker-vm.json

@@ -2,7 +2,7 @@
   "name": "Docker",
   "slug": "docker-vm",
   "categories": [
-    2, 3
+    2
   ],
   "date_created": "2025-01-20",
   "type": "vm",

json/sqlserver2022.json

@@ -31,10 +31,6 @@
       "password":null
    },
    "notes":[
-      {
-         "text":"if you not choose the install setup, execute: `/opt/mssql/bin/mssql-conf setup` in LXC shell.",
-         "type":"info"
-      },
       {
          "text":"You can setup the admin account 'SA' during installation",
          "type":"info"

misc/.app-headers

@@ -1,4 +1,4 @@
-### Generated on 01-22-2025
+### Generated on 01-21-2025
 ##################################################
 
 ### 2fauth.sh