(refactor) Remove env files and scripts, update config files

apps/archivebox/0.7.3/data.yml

@@ -1,6 +1,6 @@
 additionalProperties:
   formFields:
-    - default: "/home/archivebox"
+    - default: "./archivebox_data"
       edit: true
       envKey: ARCHIVEBOX_ROOT_PATH
       labelZh: 数据持久化路径

apps/archivebox/0.7.3/docker-compose.yml

@@ -13,15 +13,17 @@ services:
       - 1panel-network
     ports:
       - ${PANEL_APP_PORT_HTTP}:8000
-    env_file:
-      - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env}
-      - ${ENV_FILE:-/etc/1panel/envs/default.env}
     volumes:
       - ${ARCHIVEBOX_ROOT_PATH}/data:/data
     environment:
       - TZ=Asia/Shanghai
+      - ADMIN_USERNAME=${ADMIN_USERNAME}
+      - ADMIN_PASSWORD=${ADMIN_PASSWORD}
       - ALLOWED_HOSTS=*
       - CSRF_TRUSTED_ORIGINS=http://localhost:8000
+      - PUBLIC_INDEX=${}
+      - PUBLIC_SNAPSHOTS=${}
+      - PUBLIC_ADD_VIEW=${}
       - SEARCH_BACKEND_ENGINE=sonic
       - SEARCH_BACKEND_HOST_NAME=archivebox-sonic
       - SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-}
@@ -34,9 +36,6 @@ services:
       - 1panel-network
     expose:
       - 1491
-    env_file:
-      - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env}
-      - ${ENV_FILE:-/etc/1panel/envs/default.env}
     volumes:
       - ${ARCHIVEBOX_ROOT_PATH}/sonic:/var/lib/sonic/store
     environment:

apps/archivebox/0.7.3/envs/default.env

@@ -1,2 +0,0 @@
-# copyright© 2024 XinJiang Ms Studio
-ENV_FILE=.env

apps/archivebox/0.7.3/envs/global.env

@@ -1,2 +0,0 @@
-# copyright© 2024 XinJiang Ms Studio
-TZ=Asia/Shanghai

apps/archivebox/0.7.3/scripts/init.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-if [ -f .env ]; then
-  source .env
-
-  # setup-1 add default values
-  CURRENT_DIR=$(pwd)
-  sed -i '/^ENV_FILE=/d' .env
-  sed -i '/^GLOBAL_ENV_FILE=/d' .env
-  echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
-  echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env
-
-  echo "Check Finish."
-
-else
-  echo "Error: .env file not found."
-fi

apps/archivebox/0.7.3/scripts/uninstall.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-if [ -f .env ]; then
-  source .env
-
-  echo "Check Finish."
-
-else
-  echo "Error: .env file not found."
-fi

apps/archivebox/0.7.3/scripts/upgrade.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-if [ -f .env ]; then
-  source .env
-
-  # setup-1 add default values
-  CURRENT_DIR=$(pwd)
-  sed -i '/^ENV_FILE=/d' .env
-  sed -i '/^GLOBAL_ENV_FILE=/d' .env
-  echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
-  echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env
-
-  echo "Check Finish."
-
-else
-  echo "Error: .env file not found."
-fi

apps/archivebox/0.8.5rc51/data.yml

@@ -1,6 +1,6 @@
 additionalProperties:
   formFields:
-    - default: "/home/archivebox"
+    - default: "./archivebox_data"
       edit: true
       envKey: ARCHIVEBOX_ROOT_PATH
       labelZh: 数据持久化路径

apps/archivebox/0.8.5rc51/docker-compose.yml

@@ -15,15 +15,17 @@ services:
       - 1panel-network
     ports:
       - ${PANEL_APP_PORT_HTTP}:8000
-    env_file:
-      - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env}
-      - ${ENV_FILE:-/etc/1panel/envs/default.env}
     volumes:
       - ${ARCHIVEBOX_ROOT_PATH}/data:/data
     environment:
       - TZ=Asia/Shanghai
+      - ADMIN_USERNAME=${ADMIN_USERNAME}
+      - ADMIN_PASSWORD=${ADMIN_PASSWORD}
       - ALLOWED_HOSTS=*
       - CSRF_TRUSTED_ORIGINS=http://localhost:8000
+      - PUBLIC_INDEX=${}
+      - PUBLIC_SNAPSHOTS=${}
+      - PUBLIC_ADD_VIEW=${}
       - SEARCH_BACKEND_ENGINE=sonic
       - SEARCH_BACKEND_HOST_NAME=archivebox-sonic
       - SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-}
@@ -36,15 +38,17 @@ services:
     networks:
       - 1panel-network
     command: archivebox init
-    env_file:
-      - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env}
-      - ${ENV_FILE:-/etc/1panel/envs/default.env}
     volumes:
       - ${ARCHIVEBOX_ROOT_PATH}/data:/data
     environment:
       - TZ=Asia/Shanghai
+      - ADMIN_USERNAME=${ADMIN_USERNAME}
+      - ADMIN_PASSWORD=${ADMIN_PASSWORD}
       - ALLOWED_HOSTS=*
       - CSRF_TRUSTED_ORIGINS=http://localhost:8000
+      - PUBLIC_INDEX=${}
+      - PUBLIC_SNAPSHOTS=${}
+      - PUBLIC_ADD_VIEW=${}
       - SEARCH_BACKEND_ENGINE=sonic
       - SEARCH_BACKEND_HOST_NAME=archivebox-sonic
       - SEARCH_BACKEND_PASSWORD=${ADMIN_PASSWORD:-}
@@ -57,9 +61,6 @@ services:
       - 1panel-network
     expose:
       - 1491
-    env_file:
-      - ${GLOBAL_ENV_FILE:-/etc/1panel/envs/global.env}
-      - ${ENV_FILE:-/etc/1panel/envs/default.env}
     volumes:
       - ${ARCHIVEBOX_ROOT_PATH}/sonic:/var/lib/sonic/store
     environment:

apps/archivebox/0.8.5rc51/envs/default.env

@@ -1,2 +0,0 @@
-# copyright© 2024 XinJiang Ms Studio
-ENV_FILE=.env

apps/archivebox/0.8.5rc51/envs/global.env

@@ -1,2 +0,0 @@
-# copyright© 2024 XinJiang Ms Studio
-TZ=Asia/Shanghai

apps/archivebox/0.8.5rc51/scripts/init.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-if [ -f .env ]; then
-  source .env
-
-  # setup-1 add default values
-  CURRENT_DIR=$(pwd)
-  sed -i '/^ENV_FILE=/d' .env
-  sed -i '/^GLOBAL_ENV_FILE=/d' .env
-  echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
-  echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env
-
-  echo "Check Finish."
-
-else
-  echo "Error: .env file not found."
-fi

apps/archivebox/0.8.5rc51/scripts/uninstall.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-if [ -f .env ]; then
-  source .env
-
-  echo "Check Finish."
-
-else
-  echo "Error: .env file not found."
-fi

apps/archivebox/0.8.5rc51/scripts/upgrade.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-if [ -f .env ]; then
-  source .env
-
-  # setup-1 add default values
-  CURRENT_DIR=$(pwd)
-  sed -i '/^ENV_FILE=/d' .env
-  sed -i '/^GLOBAL_ENV_FILE=/d' .env
-  echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
-  echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env
-
-  echo "Check Finish."
-
-else
-  echo "Error: .env file not found."
-fi