Refactor: Blocky

Updated blocky.sh to improve update logic, including backup and restore of config, service management, and release fetching. Refactored blocky-install.sh to use fetch_and_deploy_gh_release for installation, removing manual release handling. Set Blocky as updateable in blocky.json.

CHANGELOG.md

@@ -12,6 +12,22 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
 
 ## 2025-09-10
 
+### 🚀 Updated Scripts
+
+  - #### ✨ New Features
+
+    - Booklore: Add Bookdrop location to .env [@michelroegl-brunner](https://github.com/michelroegl-brunner) ([#7533](https://github.com/community-scripts/ProxmoxVE/pull/7533))
+
+  - #### 🔧 Refactor
+
+    - Improve npmplus credential retrieval and messaging [@MickLesk](https://github.com/MickLesk) ([#7532](https://github.com/community-scripts/ProxmoxVE/pull/7532))
+
+### 🌐 Website
+
+  - #### 📝 Script Information
+
+    - set updateable to true for several lxc JSON-configs [@MickLesk](https://github.com/MickLesk) ([#7534](https://github.com/community-scripts/ProxmoxVE/pull/7534))
+
 ## 2025-09-09
 
 ### 🚀 Updated Scripts

ct/blocky.sh

@@ -3,7 +3,7 @@ source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxV
 # Copyright (c) 2021-2025 tteck
 # Author: tteck (tteckster)
 # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
-# Source: https://0xerr0r.github.io/blocky/latest/
+# Source: https://0xerr0r.github.io/blocky
 
 APP="Blocky"
 var_tags="${var_tags:-adblock}"
@@ -20,18 +20,38 @@ color
 catch_errors
 
 function update_script() {
-    header_info
+  header_info
-    check_container_storage
+  check_container_storage
-    check_container_resources
+  check_container_resources
-    if [[ ! -d /var ]]; then
+  if [[ ! -d /opt/blocky ]]; then
-        msg_error "No ${APP} Installation Found!"
+    msg_error "No ${APP} Installation Found!"
-        exit
-    fi
-    msg_info "Updating $APP LXC"
-    $STD apt-get update
-    $STD apt-get -y upgrade
-    msg_ok "Updated $APP LXC"
     exit
+  fi
+  if check_for_gh_release "blocky" "0xERR0R/blocky"; then
+    msg_info "Stopping Service"
+    systemctl stop blocky
+    msg_ok "Stopped Service"
+
+    msg_info "Backup Config"
+    mv /opt/blocky/config.yml /opt/config.yml
+    msg_ok "Backed Up Config"
+
+    msg_info "Removing Old Version"
+    rm -rf /opt/blocky
+    msg_ok "Removed Old Version"
+
+    fetch_and_deploy_gh_release "blocky" "0xERR0R/blocky" "prebuild" "latest" "/opt/blocky" "blocky_*_linux_x86_64.tar.gz"
+
+    msg_info "Restore Config"
+    mv /opt/config.yml /opt/blocky/config.yml
+    msg_ok "Restored Config"
+
+    msg_info "Starting Service"
+    systemctl start blocky
+    msg_ok "Started Service"
+    msg_ok "Updated Successfully"
+  fi
+  exit
 }
 
 start

frontend/public/json/add-netbird-lxc.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2024-05-19",
   "type": "addon",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": null,
   "documentation": "https://docs.netbird.io/",

frontend/public/json/add-tailscale-lxc.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2024-05-02",
   "type": "addon",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": null,
   "documentation": "https://tailscale.com/kb/1017/install",

frontend/public/json/apt-cacher-ng.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2024-05-02",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": 3142,
   "documentation": "https://www.unix-ag.uni-kl.de/~bloch/acng/html/index.html",

frontend/public/json/beszel.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2025-01-20",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": 8090,
   "documentation": "https://beszel.dev/guide/what-is-beszel",

frontend/public/json/blocky.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2024-05-02",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": 4000,
   "documentation": "https://0xerr0r.github.io/blocky/latest/configuration/",

frontend/public/json/cloudflare-ddns.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2025-05-22",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": null,
   "documentation": "https://github.com/favonia/cloudflare-ddns/blob/main/README.markdown",

frontend/public/json/cloudflared.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2024-05-02",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": null,
   "documentation": "https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/",

frontend/public/json/dashy.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2024-05-02",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": 4000,
   "documentation": "https://dashy.to/docs",

frontend/public/json/deconz.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2024-05-02",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": true,
   "interface_port": 80,
   "documentation": "https://github.com/dresden-elektronik/deconz-rest-plugin/wiki",

frontend/public/json/deluge.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2024-05-02",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": 8112,
   "documentation": "https://www.deluge-torrent.org/userguide/",

frontend/public/json/fhem.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2024-05-02",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": 8083,
   "documentation": "https://fhem.de/#Documentation",

frontend/public/json/filebrowser-quantum.json

@@ -7,7 +7,7 @@
   ],
   "date_created": "2025-06-18",
   "type": "addon",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": 8080,
   "documentation": "https://github.com/gtsteffaniak/filebrowser/wiki/Getting-Started",

frontend/public/json/filebrowser.json

@@ -7,7 +7,7 @@
   ],
   "date_created": "2024-05-02",
   "type": "addon",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": 8080,
   "documentation": null,

frontend/public/json/homebridge.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2024-05-02",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": 8581,
   "documentation": "https://github.com/homebridge/homebridge/wiki",

frontend/public/json/hyperhdr.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2024-05-02",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": true,
   "interface_port": 8090,
   "documentation": "https://github.com/awawa-dev/HyperHDR/wiki",

frontend/public/json/influxdb.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2024-05-02",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": 8086,
   "documentation": "https://docs.influxdata.com/",

frontend/public/json/jeedom.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2025-07-29",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": 80,
   "documentation": "https://doc.jeedom.com",

frontend/public/json/jenkins.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2024-12-26",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": 8080,
   "documentation": "https://www.jenkins.io/doc/",

frontend/public/json/lazylibrarian.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2024-05-02",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": 5299,
   "documentation": "https://lazylibrarian.gitlab.io/lazylibrarian.gitlab.io/",

frontend/public/json/lldap.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2024-08-06",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": 17170,
   "documentation": "https://github.com/lldap/lldap/blob/main/README.md",

frontend/public/json/mariadb.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2024-05-02",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": 3306,
   "documentation": "https://github.com/community-scripts/ProxmoxVE/discussions/192",

frontend/public/json/mattermost.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2025-01-30",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": 8065,
   "documentation": "https://docs.mattermost.com/",

frontend/public/json/mongodb.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2024-05-18",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": 27017,
   "documentation": "https://www.mongodb.com/docs/manual/",

frontend/public/json/mqtt.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2024-05-02",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": null,
   "documentation": "https://mosquitto.org/documentation/",

frontend/public/json/npmplus.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2025-03-13",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": 81,
   "documentation": "https://github.com/ZoeyVid/NPMplus/blob/develop/README.md",
@@ -39,7 +39,7 @@
     }
   ],
   "default_credentials": {
-    "username": "root",
+    "username": "admin@example.org",
     "password": null
   },
   "notes": [
@@ -52,7 +52,7 @@
       "type": "info"
     },
     {
-      "text": "Application credentials: `cat /opt/.npm_pwd`",
+      "text": "Application credentials: `cat /opt/.npm_pwd` - if file not exist in LXC check docker logs for password with `docker logs npmplus`",
       "type": "info"
     }
   ]

frontend/public/json/ntfy.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2024-05-02",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": 80,
   "documentation": "https://docs.ntfy.sh/",

frontend/public/json/omv.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2024-05-02",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": 80,
   "documentation": "https://docs.openmediavault.org/en/stable/",

frontend/public/json/openhab.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2024-05-02",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": 8443,
   "documentation": "https://www.openhab.org/docs/",

frontend/public/json/pialert.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2024-05-02",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": null,
   "documentation": "https://github.com/leiweibau/Pi.Alert/blob/main/README.md",

frontend/public/json/radicale.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2025-02-02",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": 5232,
   "documentation": "https://radicale.org/master.html#documentation-1",

frontend/public/json/smokeping.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2024-05-02",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": null,
   "documentation": "https://oss.oetiker.ch/smokeping/doc/index.en.html",

frontend/public/json/syncthing.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2024-05-02",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": 8384,
   "documentation": "https://docs.syncthing.net/",

frontend/public/json/tautulli.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2024-05-02",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": 8181,
   "documentation": "https://github.com/Tautulli/Tautulli/wiki",

frontend/public/json/unifi.json

@@ -6,7 +6,7 @@
   ],
   "date_created": "2024-05-02",
   "type": "ct",
-  "updateable": false,
+  "updateable": true,
   "privileged": false,
   "interface_port": 8443,
   "documentation": null,

install/blocky-install.sh

@@ -3,7 +3,7 @@
 # Copyright (c) 2021-2025 tteck
 # Author: tteck (tteckster)
 # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
-# Source: https://0xerr0r.github.io/blocky/latest/
+# Source: https://0xerr0r.github.io/blocky
 
 source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
 color
@@ -13,14 +13,12 @@ setting_up_container
 network_check
 update_os
 
-msg_info "Installing Blocky"
+fetch_and_deploy_gh_release "blocky" "0xERR0R/blocky" "prebuild" "latest" "/opt/blocky" "blocky_*_linux_x86_64.tar.gz"
+
+msg_info "Configuring Blocky"
 if systemctl is-active systemd-resolved >/dev/null 2>&1; then
   systemctl disable -q --now systemd-resolved
 fi
-mkdir /opt/blocky
-RELEASE=$(curl -fsSL https://api.github.com/repos/0xERR0R/blocky/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
-curl -fsSL "https://github.com/0xERR0R/blocky/releases/download/v${RELEASE}/blocky_v${RELEASE}_Linux_x86_64.tar.gz" | tar -xzf - -C /opt/blocky/
-
 cat <<EOF >/opt/blocky/config.yml
 # configuration documentation: https://0xerr0r.github.io/blocky/latest/configuration/
 
@@ -63,7 +61,7 @@ log:
   # optional: Log level (one from trace, debug, info, warn, error). Default: info
   level: info
 EOF
-msg_ok "Installed Blocky"
+msg_ok "Configured Blocky"
 
 msg_info "Creating Service"
 cat <<EOF >/etc/systemd/system/blocky.service
@@ -77,7 +75,7 @@ ExecStart=/opt/blocky/./blocky --config config.yml
 [Install]
 WantedBy=multi-user.target
 EOF
-$STD systemctl enable --now blocky
+$STD systemctl enable -q --now blocky
 msg_ok "Created Service"
 
 motd_ssh

install/booklore-install.sh

@@ -46,7 +46,7 @@ $STD npm run build --configuration=production
 msg_ok "Built Frontend"
 
 msg_info "Creating Environment"
-mkdir -p /opt/booklore_storage{/data,/books}
+mkdir -p /opt/booklore_storage{/data,/books,/bookdrop}
 cat <<EOF >/opt/booklore_storage/.env
 DATABASE_URL=jdbc:mariadb://localhost:3306/$DB_NAME
 DATABASE_USERNAME=$DB_USER
@@ -55,6 +55,7 @@ BOOKLORE_PORT=6060
 
 BOOKLORE_DATA_PATH=/opt/booklore_storage/data
 BOOKLORE_BOOKS_PATH=/opt/booklore_storage/books
+BOOKLORE_BOOKDROP_PATH=/opt/booklore_storage/bookdrop
 EOF
 msg_ok "Created Environment"
 

install/npmplus-install.sh

@@ -89,19 +89,36 @@ customize
 
 msg_info "Retrieving Default Login (Patience)"
 PASSWORD_FOUND=0
+
 for i in {1..60}; do
-  PASSWORD_LINE=$(docker logs "$CONTAINER_ID" 2>&1 | awk '/Creating a new user:/ { print; exit }')
+  PASSWORD_LINE=$(
-  if [[ -n "$PASSWORD_LINE" ]]; then
+    { awk '/Creating a new user:/{print; exit}' < <(docker logs "$CONTAINER_ID" 2>&1); } || true
-    PASSWORD=$(echo "$PASSWORD_LINE" | awk -F 'password: ' '{print $2}')
+  )
-    echo -e "username: admin@example.org\npassword: $PASSWORD" >/opt/.npm_pwd
+
+  if [[ -n "${PASSWORD_LINE:-}" ]]; then
+    PASSWORD="${PASSWORD_LINE#*password: }"
+    printf 'username: admin@example.org\npassword: %s\n' "$PASSWORD" >/opt/.npm_pwd
     msg_ok "Saved default login to /opt/.npm_pwd"
     PASSWORD_FOUND=1
     break
   fi
   sleep 2
 done
+if [[ $PASSWORD_FOUND -eq 0 ]]; then
+  PASSWORD_LINE=$(
+    timeout 30s bash -c '
+      docker logs -f --since=0s --tail=0 "$1" 2>&1 | awk "/Creating a new user:/{print; exit}"
+    ' _ "$CONTAINER_ID" || true
+  )
+  if [[ -n "${PASSWORD_LINE:-}" ]]; then
+    PASSWORD="${PASSWORD_LINE#*password: }"
+    printf 'username: admin@example.org\npassword: %s\n' "$PASSWORD" >/opt/.npm_pwd
+    msg_ok "Saved default login to /opt/.npm_pwd (live)"
+    PASSWORD_FOUND=1
+  fi
+fi
 
 if [[ $PASSWORD_FOUND -eq 0 ]]; then
-  msg_error "Could not retrieve default login after 60 seconds."
+  msg_error "Could not retrieve default login after 120s."
   echo -e "\nYou can manually check the container logs with:\n  docker logs $CONTAINER_ID | grep 'Creating a new user:'\n"
 fi