uvenv mgiration
This commit is contained in:
		
							parent
							
								
									66b4ff5ccb
								
							
						
					
					
						commit
						ea1cbfe207
					
				| @ -1,5 +1,5 @@ | ||||
| #!/usr/bin/env bash | ||||
| source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVED/main/misc/build.func) | ||||
| source <(curl -fsSL https://raw.githubusercontent.com/JasonGReenc/ProxmoxVED/refs/head/scraparr/misc/build.func) | ||||
| # Copyright (c) 2021-2025 community-scripts ORG | ||||
| # Author: JasonGreenC | ||||
| # License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE | ||||
| @ -27,12 +27,34 @@ function update_script() { | ||||
|     msg_error "No ${APP} Installation Found!" | ||||
|     exit | ||||
|   fi | ||||
|   msg_info "Updating ${APP}" | ||||
| 
 | ||||
|   msg_info "Stopping Services" | ||||
|   systemctl stop scraparr | ||||
|   msg_ok "Services Stopped" | ||||
| 
 | ||||
|   export SCRAPARR_VENV_PATH="/opt/scraparr/.venv" | ||||
|   export SCRAPARR_EXPORTER_BIN="${SCRAPARR_VENV_PATH}/bin/scraparr" | ||||
| 
 | ||||
|   if [[ ! -d "$PVE_VENV_PATH" || ! -x "$PVE_EXPORTER_BIN" ]]; then | ||||
|     PYTHON_VERSION="3.12" setup_uv | ||||
|     msg_info "Migrating to uv/venv" | ||||
|     rm -rf "$PVE_VENV_PATH" | ||||
|     mkdir -p /opt/scraparr | ||||
|     cd /opt/scraparr | ||||
|     $STD uv venv "$PVE_VENV_PATH" | ||||
|     $STD "$PVE_VENV_PATH/bin/python" -m ensurepip --upgrade | ||||
|     $STD "$PVE_VENV_PATH/bin/python" -m pip install --upgrade pip | ||||
|     $STD "$PVE_VENV_PATH/bin/python" -m pip install prometheus-pve-exporter | ||||
|     msg_ok "Migrated to uv/venv" | ||||
|   else | ||||
|     msg_info "Updating Prometheus Proxmox VE Exporter" | ||||
|     PYTHON_VERSION="3.12" setup_uv | ||||
|     $STD "$PVE_VENV_PATH/bin/python" -m pip install --upgrade prometheus-pve-exporter | ||||
|     msg_ok "Updated Prometheus Proxmox VE Exporter" | ||||
|   fi | ||||
|   RELEASE=$(curl -fsSL https://api.github.com/repos/thecfu/scraparr/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }') | ||||
|   if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then | ||||
|     msg_info "Stopping Services" | ||||
|     systemctl stop scraparr | ||||
|     msg_ok "Services Stopped" | ||||
| 
 | ||||
| 
 | ||||
|     msg_info "Updating ${APP} to v${RELEASE}" | ||||
|     fetch_and_deploy_gh_release "scrappar" "thecfu/scraparr" | ||||
| @ -52,7 +74,6 @@ start | ||||
| build_container | ||||
| 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}:7100${CL}" | ||||
|  | ||||
| @ -13,18 +13,17 @@ setting_up_container | ||||
| network_check | ||||
| update_os | ||||
| 
 | ||||
| msg_info "Installing Dependencies" | ||||
| $STD apt-get install -y \ | ||||
|   python3 \ | ||||
|   python3-pip | ||||
| 
 | ||||
| msg_ok "Installed Dependencies" | ||||
| PYTHON_VERSION="3.12" setup_uv | ||||
| 
 | ||||
| msg_info "Installing Scraparr" | ||||
| fetch_and_deploy_gh_release "scrappar" "thecfu/scraparr" | ||||
| pip -q install -r /opt/scraparr/src/scraparr/requirements.txt --root-user-action=ignore | ||||
| cd /opt/scraparr | ||||
| $STD uv venv /opt/scraparr/.venv | ||||
| $STD /opt/scraparr/.venv/bin/python -m ensurepip --upgrade | ||||
| $STD /opt/scraparr/.venv/bin/python -m pip install --upgrade pip | ||||
| $STD /opt/scraparr/.venv/bin/python -m pip install -r /opt/scraparr/src/scraparr/requirements.txt | ||||
| chmod -R 755 /opt/scraparr | ||||
| mkdir /scraparr && mkdir /scraparr/config | ||||
| mkdir -p /scraparr/config | ||||
| mv /opt/scraparr/config.yaml /scraparr/config/config.yaml | ||||
| chmod -R 755 /scraparr | ||||
| msg_ok "Installed Scraparr" | ||||
| @ -35,29 +34,23 @@ cat <<EOF >/etc/systemd/system/scraparr.service | ||||
| Description=Scraparr | ||||
| Wants=network-online.target | ||||
| After=network.target | ||||
| 
 | ||||
| [Service] | ||||
| Type=simple | ||||
| ExecStart=/usr/bin/python3 -m scraparr.scraparr | ||||
| WorkingDirectory=/opt/scraparr/src | ||||
| ExecStart=/opt/scraparr/.venv/bin/python -m /opt/scraparr/src/scraparr/scraparr | ||||
| User=root | ||||
| Restart=always | ||||
| 
 | ||||
| [Install] | ||||
| WantedBy=multi-user.target | ||||
| 
 | ||||
| EOF | ||||
| 
 | ||||
| systemctl daemon-reload | ||||
| systemctl enable -q --now scraparr | ||||
| 
 | ||||
| msg_ok "Configured Service" | ||||
| 
 | ||||
| motd_ssh | ||||
| customize | ||||
| 
 | ||||
| msg_info "Cleaning up" | ||||
| rm -f "$temp_file" | ||||
| $STD apt-get -y autoremove | ||||
| $STD apt-get -y autoclean | ||||
| msg_ok "Cleaned" | ||||
|  | ||||
| @ -15,14 +15,14 @@ variables() { | ||||
|   CT_TYPE=${var_unprivileged:-$CT_TYPE} | ||||
| } | ||||
| 
 | ||||
| source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/api.func) | ||||
| source <(curl -fsSL https://raw.githubusercontent.com/JasonGReenc/ProxmoxVED/refs/head/scraparr/misc/api.func) | ||||
| 
 | ||||
| if command -v curl >/dev/null 2>&1; then | ||||
|   source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/core.func) | ||||
|   source <(curl -fsSL https://raw.githubusercontent.com/JasonGReenc/ProxmoxVED/refs/head/scraparr/misc/core.func) | ||||
|   load_functions | ||||
|   #echo "(build.func) Loaded core.func via curl" | ||||
| elif command -v wget >/dev/null 2>&1; then | ||||
|   source <(wget -qO- https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/core.func) | ||||
|   source <(wget -qO- https://raw.githubusercontent.com/JasonGReenc/ProxmoxVED/refs/head/scraparr/misc/core.func) | ||||
|   load_functions | ||||
|   #echo "(build.func) Loaded core.func via wget" | ||||
| fi | ||||
| @ -35,7 +35,7 @@ catch_errors() { | ||||
| 
 | ||||
| # This function is called when an error occurs. It receives the exit code, line number, and command that caused the error, and displays an error message. | ||||
| error_handler() { | ||||
|   source /dev/stdin <<<$(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/api.func) | ||||
|   source /dev/stdin <<<$(curl -fsSL https://raw.githubusercontent.com/JasonGReenc/ProxmoxVED/refs/head/scraparr/misc/api.func) | ||||
|   printf "\e[?25h" | ||||
|   local exit_code="$?" | ||||
|   local line_number="$1" | ||||
| @ -1017,7 +1017,7 @@ install_script() { | ||||
|       header_info | ||||
|       echo -e "${INFO}${HOLD} ${GN}Using Config File on node $PVEHOST_NAME${CL}" | ||||
|       METHOD="advanced" | ||||
|       source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/config-file.func) | ||||
|       source <(curl -fsSL https://raw.githubusercontent.com/JasonGReenc/ProxmoxVED/refs/head/scraparr/misc/config-file.func) | ||||
|       config_file | ||||
|       break | ||||
|       ;; | ||||
| @ -1093,7 +1093,7 @@ check_container_storage() { | ||||
| } | ||||
| 
 | ||||
| start() { | ||||
|   source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/tools.func) | ||||
|   source <(curl -fsSL https://raw.githubusercontent.com/JasonGReenc/ProxmoxVED/refs/head/scraparr/misc/tools.func) | ||||
|   if command -v pveversion >/dev/null 2>&1; then | ||||
|     install_script | ||||
|   else | ||||
| @ -1155,9 +1155,9 @@ build_container() { | ||||
|   TEMP_DIR=$(mktemp -d) | ||||
|   pushd "$TEMP_DIR" >/dev/null | ||||
|   if [ "$var_os" == "alpine" ]; then | ||||
|     export FUNCTIONS_FILE_PATH="$(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/alpine-install.func)" | ||||
|     export FUNCTIONS_FILE_PATH="$(curl -fsSL https://raw.githubusercontent.com/JasonGReenc/ProxmoxVED/refs/head/scraparr/misc/alpine-install.func)" | ||||
|   else | ||||
|     export FUNCTIONS_FILE_PATH="$(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/install.func)" | ||||
|     export FUNCTIONS_FILE_PATH="$(curl -fsSL https://raw.githubusercontent.com/JasonGReenc/ProxmoxVED/refs/head/scraparr/misc/install.func)" | ||||
|   fi | ||||
|   export DIAGNOSTICS="$DIAGNOSTICS" | ||||
|   export RANDOM_UUID="$RANDOM_UUID" | ||||
| @ -1192,7 +1192,7 @@ build_container() { | ||||
|   $PW | ||||
| " | ||||
|   # This executes create_lxc.sh and creates the container and .conf file | ||||
|   CREATE_CMD="bash -c \"\$(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/create_lxc.sh)\"" | ||||
|   CREATE_CMD="bash -c \"\$(curl -fsSL https://raw.githubusercontent.com/JasonGReenc/ProxmoxVED/refs/head/scraparr/misc/create_lxc.sh)\"" | ||||
|   eval "$CREATE_CMD" | ||||
|   RET=$? | ||||
|   if [[ $RET -ne 0 ]]; then | ||||
| @ -1282,7 +1282,7 @@ EOF' | ||||
|     pct exec "$CTID" -- bash -c "apt-get update >/dev/null && apt-get install -y sudo curl mc gnupg2 >/dev/null" | ||||
|   fi | ||||
|   msg_ok "Customized LXC Container" | ||||
|   lxc-attach -n "$CTID" -- bash -c "$(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/install/$var_install.sh)" $? | ||||
|   lxc-attach -n "$CTID" -- bash -c "$(curl -fsSL https://raw.githubusercontent.com/JasonGReenc/ProxmoxVED/refs/head/scraparr/install/$var_install.sh)" $? | ||||
| 
 | ||||
| } | ||||
| 
 | ||||
| @ -1295,7 +1295,7 @@ description() { | ||||
|     cat <<EOF | ||||
| <div align='center'> | ||||
|   <a href='https://Helper-Scripts.com' target='_blank' rel='noopener noreferrer'> | ||||
|     <img src='https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/images/logo-81x112.png' alt='Logo' style='width:81px;height:112px;'/> | ||||
|     <img src='https://raw.githubusercontent.com/JasonGReenc/ProxmoxVED/refs/head/scraparr/misc/images/logo-81x112.png' alt='Logo' style='width:81px;height:112px;'/> | ||||
|   </a> | ||||
| 
 | ||||
|   <h2 style='font-size: 24px; margin: 20px 0;'>${APP} LXC</h2> | ||||
|  | ||||
| @ -6,134 +6,134 @@ | ||||
| # https://github.com/community-scripts/ProxmoxVED/raw/main/LICENSE | ||||
| 
 | ||||
| if ! command -v curl >/dev/null 2>&1; then | ||||
|   printf "\r\e[2K%b" '\033[93m Setup Source \033[m' >&2 | ||||
|   apt-get update >/dev/null 2>&1 | ||||
|   apt-get install -y curl >/dev/null 2>&1 | ||||
|     printf "\r\e[2K%b" '\033[93m Setup Source \033[m' >&2 | ||||
|     apt-get update >/dev/null 2>&1 | ||||
|     apt-get install -y curl >/dev/null 2>&1 | ||||
| fi | ||||
| source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/core.func) | ||||
| source <(curl -fsSL https://raw.githubusercontent.com/JasonGReenc/ProxmoxVED/refs/head/scraparr/misc/core.func) | ||||
| load_functions | ||||
| 
 | ||||
| # This function enables IPv6 if it's not disabled and sets verbose mode | ||||
| verb_ip6() { | ||||
|   set_std_mode # Set STD mode based on VERBOSE | ||||
|     set_std_mode # Set STD mode based on VERBOSE | ||||
| 
 | ||||
|   if [ "$DISABLEIPV6" == "yes" ]; then | ||||
|     echo "net.ipv6.conf.all.disable_ipv6 = 1" >>/etc/sysctl.conf | ||||
|     $STD sysctl -p | ||||
|   fi | ||||
|     if [ "$DISABLEIPV6" == "yes" ]; then | ||||
|         echo "net.ipv6.conf.all.disable_ipv6 = 1" >>/etc/sysctl.conf | ||||
|         $STD sysctl -p | ||||
|     fi | ||||
| } | ||||
| 
 | ||||
| # This function sets error handling options and defines the error_handler function to handle errors | ||||
| catch_errors() { | ||||
|   set -Eeuo pipefail | ||||
|   trap 'error_handler $LINENO "$BASH_COMMAND"' ERR | ||||
|     set -Eeuo pipefail | ||||
|     trap 'error_handler $LINENO "$BASH_COMMAND"' ERR | ||||
| } | ||||
| 
 | ||||
| # This function handles errors | ||||
| error_handler() { | ||||
|   source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) | ||||
|   printf "\e[?25h" | ||||
|   local exit_code="$?" | ||||
|   local line_number="$1" | ||||
|   local command="$2" | ||||
|   local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}" | ||||
|   echo -e "\n$error_message" | ||||
|     source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/api.func) | ||||
|     printf "\e[?25h" | ||||
|     local exit_code="$?" | ||||
|     local line_number="$1" | ||||
|     local command="$2" | ||||
|     local error_message="${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}" | ||||
|     echo -e "\n$error_message" | ||||
| 
 | ||||
|   if [[ "$line_number" -eq 50 ]]; then | ||||
|     echo -e "The silent function has suppressed the error, run the script with verbose mode enabled, which will provide more detailed output.\n" | ||||
|     post_update_to_api "failed" "No error message, script ran in silent mode" | ||||
|   else | ||||
|     post_update_to_api "failed" "${command}" | ||||
|   fi | ||||
|     if [[ "$line_number" -eq 50 ]]; then | ||||
|         echo -e "The silent function has suppressed the error, run the script with verbose mode enabled, which will provide more detailed output.\n" | ||||
|         post_update_to_api "failed" "No error message, script ran in silent mode" | ||||
|     else | ||||
|         post_update_to_api "failed" "${command}" | ||||
|     fi | ||||
| } | ||||
| 
 | ||||
| # This function sets up the Container OS by generating the locale, setting the timezone, and checking the network connection | ||||
| setting_up_container() { | ||||
|   msg_info "Setting up Container OS" | ||||
|   for ((i = RETRY_NUM; i > 0; i--)); do | ||||
|     if [ "$(hostname -I)" != "" ]; then | ||||
|       break | ||||
|     msg_info "Setting up Container OS" | ||||
|     for ((i = RETRY_NUM; i > 0; i--)); do | ||||
|         if [ "$(hostname -I)" != "" ]; then | ||||
|             break | ||||
|         fi | ||||
|         echo 1>&2 -en "${CROSS}${RD} No Network! " | ||||
|         sleep $RETRY_EVERY | ||||
|     done | ||||
|     if [ "$(hostname -I)" = "" ]; then | ||||
|         echo 1>&2 -e "\n${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" | ||||
|         echo -e "${NETWORK}Check Network Settings" | ||||
|         exit 1 | ||||
|     fi | ||||
|     echo 1>&2 -en "${CROSS}${RD} No Network! " | ||||
|     sleep $RETRY_EVERY | ||||
|   done | ||||
|   if [ "$(hostname -I)" = "" ]; then | ||||
|     echo 1>&2 -e "\n${CROSS}${RD} No Network After $RETRY_NUM Tries${CL}" | ||||
|     echo -e "${NETWORK}Check Network Settings" | ||||
|     exit 1 | ||||
|   fi | ||||
|   rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED | ||||
|   systemctl disable -q --now systemd-networkd-wait-online.service | ||||
|   msg_ok "Set up Container OS" | ||||
|   msg_custom "${CM}" "${GN}" "Network Connected: ${BL}$(hostname -I)" | ||||
|     rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED | ||||
|     systemctl disable -q --now systemd-networkd-wait-online.service | ||||
|     msg_ok "Set up Container OS" | ||||
|     msg_custom "${CM}" "${GN}" "Network Connected: ${BL}$(hostname -I)" | ||||
| } | ||||
| 
 | ||||
| # This function checks the network connection by pinging a known IP address and prompts the user to continue if the internet is not connected | ||||
| network_check() { | ||||
|   set +e | ||||
|   trap - ERR | ||||
|   ipv4_connected=false | ||||
|   ipv6_connected=false | ||||
|   sleep 1 | ||||
|     set +e | ||||
|     trap - ERR | ||||
|     ipv4_connected=false | ||||
|     ipv6_connected=false | ||||
|     sleep 1 | ||||
| 
 | ||||
|   # Check IPv4 connectivity to Google, Cloudflare & Quad9 DNS servers. | ||||
|   if ping -c 1 -W 1 1.1.1.1 &>/dev/null || ping -c 1 -W 1 8.8.8.8 &>/dev/null || ping -c 1 -W 1 9.9.9.9 &>/dev/null; then | ||||
|     msg_ok "IPv4 Internet Connected" | ||||
|     ipv4_connected=true | ||||
|   else | ||||
|     msg_error "IPv4 Internet Not Connected" | ||||
|   fi | ||||
| 
 | ||||
|   # Check IPv6 connectivity to Google, Cloudflare & Quad9 DNS servers. | ||||
|   if ping6 -c 1 -W 1 2606:4700:4700::1111 &>/dev/null || ping6 -c 1 -W 1 2001:4860:4860::8888 &>/dev/null || ping6 -c 1 -W 1 2620:fe::fe &>/dev/null; then | ||||
|     msg_ok "IPv6 Internet Connected" | ||||
|     ipv6_connected=true | ||||
|   else | ||||
|     msg_error "IPv6 Internet Not Connected" | ||||
|   fi | ||||
| 
 | ||||
|   # If both IPv4 and IPv6 checks fail, prompt the user | ||||
|   if [[ $ipv4_connected == false && $ipv6_connected == false ]]; then | ||||
|     read -r -p "No Internet detected, would you like to continue anyway? <y/N> " prompt | ||||
|     if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then | ||||
|       echo -e "${INFO}${RD}Expect Issues Without Internet${CL}" | ||||
|     # Check IPv4 connectivity to Google, Cloudflare & Quad9 DNS servers. | ||||
|     if ping -c 1 -W 1 1.1.1.1 &>/dev/null || ping -c 1 -W 1 8.8.8.8 &>/dev/null || ping -c 1 -W 1 9.9.9.9 &>/dev/null; then | ||||
|         msg_ok "IPv4 Internet Connected" | ||||
|         ipv4_connected=true | ||||
|     else | ||||
|       echo -e "${NETWORK}Check Network Settings" | ||||
|       exit 1 | ||||
|         msg_error "IPv4 Internet Not Connected" | ||||
|     fi | ||||
|   fi | ||||
| 
 | ||||
|   # DNS resolution checks for GitHub-related domains (IPv4 and/or IPv6) | ||||
|   GITHUB_HOSTS=("github.com" "raw.githubusercontent.com" "api.github.com" "git.community-scripts.org") | ||||
|   GITHUB_STATUS="GitHub DNS:" | ||||
|   DNS_FAILED=false | ||||
| 
 | ||||
|   for HOST in "${GITHUB_HOSTS[@]}"; do | ||||
|     RESOLVEDIP=$(getent hosts "$HOST" | awk '{ print $1 }' | grep -E '(^([0-9]{1,3}\.){3}[0-9]{1,3}$)|(^[a-fA-F0-9:]+$)' | head -n1) | ||||
|     if [[ -z "$RESOLVEDIP" ]]; then | ||||
|       GITHUB_STATUS+="$HOST:($DNSFAIL)" | ||||
|       DNS_FAILED=true | ||||
|     # Check IPv6 connectivity to Google, Cloudflare & Quad9 DNS servers. | ||||
|     if ping6 -c 1 -W 1 2606:4700:4700::1111 &>/dev/null || ping6 -c 1 -W 1 2001:4860:4860::8888 &>/dev/null || ping6 -c 1 -W 1 2620:fe::fe &>/dev/null; then | ||||
|         msg_ok "IPv6 Internet Connected" | ||||
|         ipv6_connected=true | ||||
|     else | ||||
|       GITHUB_STATUS+=" $HOST:($DNSOK)" | ||||
|         msg_error "IPv6 Internet Not Connected" | ||||
|     fi | ||||
|   done | ||||
| 
 | ||||
|   if [[ "$DNS_FAILED" == true ]]; then | ||||
|     fatal "$GITHUB_STATUS" | ||||
|   else | ||||
|     msg_ok "$GITHUB_STATUS" | ||||
|   fi | ||||
|     # If both IPv4 and IPv6 checks fail, prompt the user | ||||
|     if [[ $ipv4_connected == false && $ipv6_connected == false ]]; then | ||||
|         read -r -p "No Internet detected, would you like to continue anyway? <y/N> " prompt | ||||
|         if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then | ||||
|             echo -e "${INFO}${RD}Expect Issues Without Internet${CL}" | ||||
|         else | ||||
|             echo -e "${NETWORK}Check Network Settings" | ||||
|             exit 1 | ||||
|         fi | ||||
|     fi | ||||
| 
 | ||||
|   set -e | ||||
|   trap 'error_handler $LINENO "$BASH_COMMAND"' ERR | ||||
|     # DNS resolution checks for GitHub-related domains (IPv4 and/or IPv6) | ||||
|     GITHUB_HOSTS=("github.com" "raw.githubusercontent.com" "api.github.com" "git.community-scripts.org") | ||||
|     GITHUB_STATUS="GitHub DNS:" | ||||
|     DNS_FAILED=false | ||||
| 
 | ||||
|     for HOST in "${GITHUB_HOSTS[@]}"; do | ||||
|         RESOLVEDIP=$(getent hosts "$HOST" | awk '{ print $1 }' | grep -E '(^([0-9]{1,3}\.){3}[0-9]{1,3}$)|(^[a-fA-F0-9:]+$)' | head -n1) | ||||
|         if [[ -z "$RESOLVEDIP" ]]; then | ||||
|             GITHUB_STATUS+="$HOST:($DNSFAIL)" | ||||
|             DNS_FAILED=true | ||||
|         else | ||||
|             GITHUB_STATUS+=" $HOST:($DNSOK)" | ||||
|         fi | ||||
|     done | ||||
| 
 | ||||
|     if [[ "$DNS_FAILED" == true ]]; then | ||||
|         fatal "$GITHUB_STATUS" | ||||
|     else | ||||
|         msg_ok "$GITHUB_STATUS" | ||||
|     fi | ||||
| 
 | ||||
|     set -e | ||||
|     trap 'error_handler $LINENO "$BASH_COMMAND"' ERR | ||||
| } | ||||
| 
 | ||||
| # This function updates the Container OS by running apt-get update and upgrade | ||||
| update_os() { | ||||
|   msg_info "Updating Container OS" | ||||
|   if [[ "$CACHER" == "yes" ]]; then | ||||
|     echo "Acquire::http::Proxy-Auto-Detect \"/usr/local/bin/apt-proxy-detect.sh\";" >/etc/apt/apt.conf.d/00aptproxy | ||||
|     cat <<EOF >/usr/local/bin/apt-proxy-detect.sh | ||||
|     msg_info "Updating Container OS" | ||||
|     if [[ "$CACHER" == "yes" ]]; then | ||||
|         echo "Acquire::http::Proxy-Auto-Detect \"/usr/local/bin/apt-proxy-detect.sh\";" >/etc/apt/apt.conf.d/00aptproxy | ||||
|         cat <<EOF >/usr/local/bin/apt-proxy-detect.sh | ||||
| #!/bin/bash | ||||
| if nc -w1 -z "${CACHER_IP}" 3142; then | ||||
|   echo -n "http://${CACHER_IP}:3142" | ||||
| @ -141,66 +141,66 @@ else | ||||
|   echo -n "DIRECT" | ||||
| fi | ||||
| EOF | ||||
|     chmod +x /usr/local/bin/apt-proxy-detect.sh | ||||
|   fi | ||||
|   $STD apt-get update | ||||
|   $STD apt-get -o Dpkg::Options::="--force-confold" -y dist-upgrade | ||||
|   rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED | ||||
|   msg_ok "Updated Container OS" | ||||
|   source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVED/raw/branch/main/misc/tools.func) | ||||
|         chmod +x /usr/local/bin/apt-proxy-detect.sh | ||||
|     fi | ||||
|     $STD apt-get update | ||||
|     $STD apt-get -o Dpkg::Options::="--force-confold" -y dist-upgrade | ||||
|     rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED | ||||
|     msg_ok "Updated Container OS" | ||||
|     source <(curl -fsSL https://raw.githubusercontent.com/JasonGReenc/ProxmoxVED/refs/head/scraparr/misc/tools.func) | ||||
| } | ||||
| 
 | ||||
| # This function modifies the message of the day (motd) and SSH settings | ||||
| motd_ssh() { | ||||
|   grep -qxF "export TERM='xterm-256color'" /root/.bashrc || echo "export TERM='xterm-256color'" >>/root/.bashrc | ||||
|     grep -qxF "export TERM='xterm-256color'" /root/.bashrc || echo "export TERM='xterm-256color'" >>/root/.bashrc | ||||
| 
 | ||||
|   if [ -f "/etc/os-release" ]; then | ||||
|     OS_NAME=$(grep ^NAME /etc/os-release | cut -d= -f2 | tr -d '"') | ||||
|     OS_VERSION=$(grep ^VERSION_ID /etc/os-release | cut -d= -f2 | tr -d '"') | ||||
|   elif [ -f "/etc/debian_version" ]; then | ||||
|     OS_NAME="Debian" | ||||
|     OS_VERSION=$(cat /etc/debian_version) | ||||
|   fi | ||||
|     if [ -f "/etc/os-release" ]; then | ||||
|         OS_NAME=$(grep ^NAME /etc/os-release | cut -d= -f2 | tr -d '"') | ||||
|         OS_VERSION=$(grep ^VERSION_ID /etc/os-release | cut -d= -f2 | tr -d '"') | ||||
|     elif [ -f "/etc/debian_version" ]; then | ||||
|         OS_NAME="Debian" | ||||
|         OS_VERSION=$(cat /etc/debian_version) | ||||
|     fi | ||||
| 
 | ||||
|   PROFILE_FILE="/etc/profile.d/00_lxc-details.sh" | ||||
|   echo "echo -e \"\"" >"$PROFILE_FILE" | ||||
|   echo -e "echo -e \"${BOLD}${YW}${APPLICATION} LXC Container - DEV Repository${CL}\"" >>"$PROFILE_FILE" | ||||
|   echo -e "echo -e \"${RD}WARNING: This is a DEVELOPMENT version (ProxmoxVED). Do NOT use in production!${CL}\"" >>"$PROFILE_FILE" | ||||
|   echo -e "echo -e \"${YW} OS: ${GN}${OS_NAME} - Version: ${OS_VERSION}${CL}\"" >>"$PROFILE_FILE" | ||||
|   echo -e "echo -e \"${YW} Hostname: ${GN}\$(hostname)${CL}\"" >>"$PROFILE_FILE" | ||||
|   echo -e "echo -e \"${YW} IP Address: ${GN}\$(hostname -I | awk '{print \$1}')${CL}\"" >>"$PROFILE_FILE" | ||||
|   echo -e "echo -e \"${YW} Repository: ${GN}https://github.com/community-scripts/ProxmoxVED${CL}\"" >>"$PROFILE_FILE" | ||||
|   echo "echo \"\"" >>"$PROFILE_FILE" | ||||
|     PROFILE_FILE="/etc/profile.d/00_lxc-details.sh" | ||||
|     echo "echo -e \"\"" >"$PROFILE_FILE" | ||||
|     echo -e "echo -e \"${BOLD}${YW}${APPLICATION} LXC Container - DEV Repository${CL}\"" >>"$PROFILE_FILE" | ||||
|     echo -e "echo -e \"${RD}WARNING: This is a DEVELOPMENT version (ProxmoxVED). Do NOT use in production!${CL}\"" >>"$PROFILE_FILE" | ||||
|     echo -e "echo -e \"${YW} OS: ${GN}${OS_NAME} - Version: ${OS_VERSION}${CL}\"" >>"$PROFILE_FILE" | ||||
|     echo -e "echo -e \"${YW} Hostname: ${GN}\$(hostname)${CL}\"" >>"$PROFILE_FILE" | ||||
|     echo -e "echo -e \"${YW} IP Address: ${GN}\$(hostname -I | awk '{print \$1}')${CL}\"" >>"$PROFILE_FILE" | ||||
|     echo -e "echo -e \"${YW} Repository: ${GN}https://github.com/community-scripts/ProxmoxVED${CL}\"" >>"$PROFILE_FILE" | ||||
|     echo "echo \"\"" >>"$PROFILE_FILE" | ||||
| 
 | ||||
|   chmod -x /etc/update-motd.d/* | ||||
|     chmod -x /etc/update-motd.d/* | ||||
| 
 | ||||
|   if [[ "${SSH_ROOT}" == "yes" ]]; then | ||||
|     sed -i "s/#PermitRootLogin prohibit-password/PermitRootLogin yes/g" /etc/ssh/sshd_config | ||||
|     systemctl restart sshd | ||||
|   fi | ||||
|     if [[ "${SSH_ROOT}" == "yes" ]]; then | ||||
|         sed -i "s/#PermitRootLogin prohibit-password/PermitRootLogin yes/g" /etc/ssh/sshd_config | ||||
|         systemctl restart sshd | ||||
|     fi | ||||
| } | ||||
| 
 | ||||
| # This function customizes the container by modifying the getty service and enabling auto-login for the root user | ||||
| customize() { | ||||
|   if [[ "$PASSWORD" == "" ]]; then | ||||
|     msg_info "Customizing Container" | ||||
|     GETTY_OVERRIDE="/etc/systemd/system/container-getty@1.service.d/override.conf" | ||||
|     mkdir -p $(dirname $GETTY_OVERRIDE) | ||||
|     cat <<EOF >$GETTY_OVERRIDE | ||||
|     if [[ "$PASSWORD" == "" ]]; then | ||||
|         msg_info "Customizing Container" | ||||
|         GETTY_OVERRIDE="/etc/systemd/system/container-getty@1.service.d/override.conf" | ||||
|         mkdir -p $(dirname $GETTY_OVERRIDE) | ||||
|         cat <<EOF >$GETTY_OVERRIDE | ||||
|   [Service] | ||||
|   ExecStart= | ||||
|   ExecStart=-/sbin/agetty --autologin root --noclear --keep-baud tty%I 115200,38400,9600 \$TERM | ||||
| EOF | ||||
|     systemctl daemon-reload | ||||
|     systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') | ||||
|     msg_ok "Customized Container" | ||||
|   fi | ||||
|   echo "bash -c \"\$(curl -fsSL https://github.com/community-scripts/ProxmoxVED/raw/main/ct/${app}.sh)\"" >/usr/bin/update | ||||
|   chmod +x /usr/bin/update | ||||
|   if [[ -n "${SSH_AUTHORIZED_KEY}" ]]; then | ||||
|     mkdir -p /root/.ssh | ||||
|     echo "${SSH_AUTHORIZED_KEY}" >/root/.ssh/authorized_keys | ||||
|     chmod 700 /root/.ssh | ||||
|     chmod 600 /root/.ssh/authorized_keys | ||||
|   fi | ||||
|         systemctl daemon-reload | ||||
|         systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') | ||||
|         msg_ok "Customized Container" | ||||
|     fi | ||||
|     echo "bash -c \"\$(curl -fsSL https://github.com/community-scripts/ProxmoxVED/raw/main/ct/${app}.sh)\"" >/usr/bin/update | ||||
|     chmod +x /usr/bin/update | ||||
|     if [[ -n "${SSH_AUTHORIZED_KEY}" ]]; then | ||||
|         mkdir -p /root/.ssh | ||||
|         echo "${SSH_AUTHORIZED_KEY}" >/root/.ssh/authorized_keys | ||||
|         chmod 700 /root/.ssh | ||||
|         chmod 600 /root/.ssh/authorized_keys | ||||
|     fi | ||||
| } | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Jason Green
						Jason Green