Booklore: Add Bookdrop location to .env

2025-09-13 07:10:51 +02:00 · 2025-09-10 08:49:42 +02:00
38 changed files with 62 additions and 113 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,22 +12,6 @@ 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
--- a/ct/blocky.sh
+++ b/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
+# Source: https://0xerr0r.github.io/blocky/latest/

 APP="Blocky"
 var_tags="${var_tags:-adblock}"
@@ -20,38 +20,18 @@ color
 catch_errors

 function update_script() {
-  header_info
-  check_container_storage
-  check_container_resources
-  if [[ ! -d /opt/blocky ]]; then
-    msg_error "No ${APP} Installation Found!"
+    header_info
+    check_container_storage
+    check_container_resources
+    if [[ ! -d /var ]]; then
+        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
@@ -61,4 +41,4 @@ description
 msg_ok "Completed Successfully!\n"
 echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
 echo -e "${INFO}${YW} Access it using the following URL:${CL}"
-echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:4000${CL}"
+echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:4000${CL}"
--- a/frontend/public/json/add-netbird-lxc.json
+++ b/frontend/public/json/add-netbird-lxc.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2024-05-19",
  "type": "addon",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": null,
  "documentation": "https://docs.netbird.io/",
--- a/frontend/public/json/add-tailscale-lxc.json
+++ b/frontend/public/json/add-tailscale-lxc.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2024-05-02",
  "type": "addon",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": null,
  "documentation": "https://tailscale.com/kb/1017/install",
--- a/frontend/public/json/apt-cacher-ng.json
+++ b/frontend/public/json/apt-cacher-ng.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2024-05-02",
  "type": "ct",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": 3142,
  "documentation": "https://www.unix-ag.uni-kl.de/~bloch/acng/html/index.html",
--- a/frontend/public/json/beszel.json
+++ b/frontend/public/json/beszel.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2025-01-20",
  "type": "ct",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": 8090,
  "documentation": "https://beszel.dev/guide/what-is-beszel",
--- a/frontend/public/json/blocky.json
+++ b/frontend/public/json/blocky.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2024-05-02",
  "type": "ct",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": 4000,
  "documentation": "https://0xerr0r.github.io/blocky/latest/configuration/",
--- a/frontend/public/json/cloudflare-ddns.json
+++ b/frontend/public/json/cloudflare-ddns.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2025-05-22",
  "type": "ct",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": null,
  "documentation": "https://github.com/favonia/cloudflare-ddns/blob/main/README.markdown",
--- a/frontend/public/json/cloudflared.json
+++ b/frontend/public/json/cloudflared.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2024-05-02",
  "type": "ct",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": null,
  "documentation": "https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/",
--- a/frontend/public/json/dashy.json
+++ b/frontend/public/json/dashy.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2024-05-02",
  "type": "ct",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": 4000,
  "documentation": "https://dashy.to/docs",
--- a/frontend/public/json/deconz.json
+++ b/frontend/public/json/deconz.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2024-05-02",
  "type": "ct",
-  "updateable": true,
+  "updateable": false,
  "privileged": true,
  "interface_port": 80,
  "documentation": "https://github.com/dresden-elektronik/deconz-rest-plugin/wiki",
--- a/frontend/public/json/deluge.json
+++ b/frontend/public/json/deluge.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2024-05-02",
  "type": "ct",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": 8112,
  "documentation": "https://www.deluge-torrent.org/userguide/",
--- a/frontend/public/json/fhem.json
+++ b/frontend/public/json/fhem.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2024-05-02",
  "type": "ct",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": 8083,
  "documentation": "https://fhem.de/#Documentation",
--- a/frontend/public/json/filebrowser-quantum.json
+++ b/frontend/public/json/filebrowser-quantum.json
@@ -7,7 +7,7 @@
  ],
  "date_created": "2025-06-18",
  "type": "addon",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": 8080,
  "documentation": "https://github.com/gtsteffaniak/filebrowser/wiki/Getting-Started",
--- a/frontend/public/json/filebrowser.json
+++ b/frontend/public/json/filebrowser.json
@@ -7,7 +7,7 @@
  ],
  "date_created": "2024-05-02",
  "type": "addon",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": 8080,
  "documentation": null,
--- a/frontend/public/json/homebridge.json
+++ b/frontend/public/json/homebridge.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2024-05-02",
  "type": "ct",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": 8581,
  "documentation": "https://github.com/homebridge/homebridge/wiki",
--- a/frontend/public/json/hyperhdr.json
+++ b/frontend/public/json/hyperhdr.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2024-05-02",
  "type": "ct",
-  "updateable": true,
+  "updateable": false,
  "privileged": true,
  "interface_port": 8090,
  "documentation": "https://github.com/awawa-dev/HyperHDR/wiki",
--- a/frontend/public/json/influxdb.json
+++ b/frontend/public/json/influxdb.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2024-05-02",
  "type": "ct",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": 8086,
  "documentation": "https://docs.influxdata.com/",
--- a/frontend/public/json/jeedom.json
+++ b/frontend/public/json/jeedom.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2025-07-29",
  "type": "ct",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": 80,
  "documentation": "https://doc.jeedom.com",
--- a/frontend/public/json/jenkins.json
+++ b/frontend/public/json/jenkins.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2024-12-26",
  "type": "ct",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": 8080,
  "documentation": "https://www.jenkins.io/doc/",
--- a/frontend/public/json/lazylibrarian.json
+++ b/frontend/public/json/lazylibrarian.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2024-05-02",
  "type": "ct",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": 5299,
  "documentation": "https://lazylibrarian.gitlab.io/lazylibrarian.gitlab.io/",
--- a/frontend/public/json/lldap.json
+++ b/frontend/public/json/lldap.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2024-08-06",
  "type": "ct",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": 17170,
  "documentation": "https://github.com/lldap/lldap/blob/main/README.md",
--- a/frontend/public/json/mariadb.json
+++ b/frontend/public/json/mariadb.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2024-05-02",
  "type": "ct",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": 3306,
  "documentation": "https://github.com/community-scripts/ProxmoxVE/discussions/192",
--- a/frontend/public/json/mattermost.json
+++ b/frontend/public/json/mattermost.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2025-01-30",
  "type": "ct",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": 8065,
  "documentation": "https://docs.mattermost.com/",
--- a/frontend/public/json/mongodb.json
+++ b/frontend/public/json/mongodb.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2024-05-18",
  "type": "ct",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": 27017,
  "documentation": "https://www.mongodb.com/docs/manual/",
--- a/frontend/public/json/mqtt.json
+++ b/frontend/public/json/mqtt.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2024-05-02",
  "type": "ct",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": null,
  "documentation": "https://mosquitto.org/documentation/",
--- a/frontend/public/json/npmplus.json
+++ b/frontend/public/json/npmplus.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2025-03-13",
  "type": "ct",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": 81,
  "documentation": "https://github.com/ZoeyVid/NPMplus/blob/develop/README.md",
@@ -39,7 +39,7 @@
    }
  ],
  "default_credentials": {
-    "username": "admin@example.org",
+    "username": "root",
    "password": null
  },
  "notes": [
@@ -52,7 +52,7 @@
      "type": "info"
    },
    {
-      "text": "Application credentials: `cat /opt/.npm_pwd` - if file not exist in LXC check docker logs for password with `docker logs npmplus`",
+      "text": "Application credentials: `cat /opt/.npm_pwd`",
      "type": "info"
    }
  ]
--- a/frontend/public/json/ntfy.json
+++ b/frontend/public/json/ntfy.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2024-05-02",
  "type": "ct",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": 80,
  "documentation": "https://docs.ntfy.sh/",
--- a/frontend/public/json/omv.json
+++ b/frontend/public/json/omv.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2024-05-02",
  "type": "ct",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": 80,
  "documentation": "https://docs.openmediavault.org/en/stable/",
--- a/frontend/public/json/openhab.json
+++ b/frontend/public/json/openhab.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2024-05-02",
  "type": "ct",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": 8443,
  "documentation": "https://www.openhab.org/docs/",
--- a/frontend/public/json/pialert.json
+++ b/frontend/public/json/pialert.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2024-05-02",
  "type": "ct",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": null,
  "documentation": "https://github.com/leiweibau/Pi.Alert/blob/main/README.md",
--- a/frontend/public/json/radicale.json
+++ b/frontend/public/json/radicale.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2025-02-02",
  "type": "ct",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": 5232,
  "documentation": "https://radicale.org/master.html#documentation-1",
--- a/frontend/public/json/smokeping.json
+++ b/frontend/public/json/smokeping.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2024-05-02",
  "type": "ct",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": null,
  "documentation": "https://oss.oetiker.ch/smokeping/doc/index.en.html",
--- a/frontend/public/json/syncthing.json
+++ b/frontend/public/json/syncthing.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2024-05-02",
  "type": "ct",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": 8384,
  "documentation": "https://docs.syncthing.net/",
--- a/frontend/public/json/tautulli.json
+++ b/frontend/public/json/tautulli.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2024-05-02",
  "type": "ct",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": 8181,
  "documentation": "https://github.com/Tautulli/Tautulli/wiki",
--- a/frontend/public/json/unifi.json
+++ b/frontend/public/json/unifi.json
@@ -6,7 +6,7 @@
  ],
  "date_created": "2024-05-02",
  "type": "ct",
-  "updateable": true,
+  "updateable": false,
  "privileged": false,
  "interface_port": 8443,
  "documentation": null,
--- a/install/blocky-install.sh
+++ b/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
+# Source: https://0xerr0r.github.io/blocky/latest/

 source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
 color
@@ -13,12 +13,14 @@ setting_up_container
 network_check
 update_os

-fetch_and_deploy_gh_release "blocky" "0xERR0R/blocky" "prebuild" "latest" "/opt/blocky" "blocky_*_linux_x86_64.tar.gz"
-
-msg_info "Configuring Blocky"
+msg_info "Installing 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/

@@ -61,7 +63,7 @@ log:
  # optional: Log level (one from trace, debug, info, warn, error). Default: info
  level: info
 EOF
-msg_ok "Configured Blocky"
+msg_ok "Installed Blocky"

 msg_info "Creating Service"
 cat <<EOF >/etc/systemd/system/blocky.service
@@ -75,7 +77,7 @@ ExecStart=/opt/blocky/./blocky --config config.yml
 [Install]
 WantedBy=multi-user.target
 EOF
-$STD systemctl enable -q --now blocky
+$STD systemctl enable --now blocky
 msg_ok "Created Service"

 motd_ssh
--- a/install/npmplus-install.sh
+++ b/install/npmplus-install.sh
@@ -89,36 +89,19 @@ customize

 msg_info "Retrieving Default Login (Patience)"
 PASSWORD_FOUND=0
-
 for i in {1..60}; do
-  PASSWORD_LINE=$(
-    { awk '/Creating a new user:/{print; exit}' < <(docker logs "$CONTAINER_ID" 2>&1); } || true
-  )
-
-  if [[ -n "${PASSWORD_LINE:-}" ]]; then
-    PASSWORD="${PASSWORD_LINE#*password: }"
-    printf 'username: admin@example.org\npassword: %s\n' "$PASSWORD" >/opt/.npm_pwd
+  PASSWORD_LINE=$(docker logs "$CONTAINER_ID" 2>&1 | awk '/Creating a new user:/ { print; exit }')
+  if [[ -n "$PASSWORD_LINE" ]]; then
+    PASSWORD=$(echo "$PASSWORD_LINE" | awk -F 'password: ' '{print $2}')
+    echo -e "username: admin@example.org\npassword: $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 120s."
+  msg_error "Could not retrieve default login after 60 seconds."
  echo -e "\nYou can manually check the container logs with:\n  docker logs $CONTAINER_ID | grep 'Creating a new user:'\n"
 fi