Merge pull request #158 from tteck/v3

V3
This commit is contained in:
tteckster 2022-04-17 20:42:42 -04:00 committed by GitHub
commit e36330bed5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 683 additions and 107 deletions

View file

@ -19,6 +19,10 @@ All notable changes to this project will be documented in this file.
- New V3 Install Script - New V3 Install Script
- **Podman Home Assistant LXC** - **Podman Home Assistant LXC**
- New V3 Install Script - New V3 Install Script
- **Docker LXC**
- New V3 Install Script
- **PhotoPrism LXC**
- New V3 Install Script
## 2022-04-16 ## 2022-04-16

View file

@ -841,23 +841,21 @@ ________________________________________________________________________________
</details> </details>
<details> <details>
<summary markdown="span"> Docker LXC </summary> <summary markdown="span"> 🔸Docker LXC </summary>
<p align="center"><img src="https://raw.githubusercontent.com/tteck/Proxmox/main/misc/images/docker.png" height="100"/></p> <p align="center"><img src="https://raw.githubusercontent.com/tteck/Proxmox/main/misc/images/docker.png" height="100"/></p>
<h1 align="center" id="heading"> Docker LXC </h1> <h1 align="center" id="heading"> Docker LXC </h1>
<h3 align="center"> With Selectable ZFS Storage Drivers & Option to Add Portainer and/or Docker Compose</h3> <h3 align="center"> Options to Install Portainer and/or Docker Compose</h3>
To create a new Proxmox Docker LXC, run the following in the Proxmox Shell (V2). To create a new Proxmox Docker LXC, run the following in the Proxmox Shell.
```yaml ```yaml
bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/docker.sh)" bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/docker-v3.sh)"
``` ```
<h3 align="center" id="heading">⚡ Default Settings: 2GB RAM - 4GB Storage - 2vCPU ⚡</h3> <h3 align="center" id="heading">⚡ Default Settings: 2GB RAM - 4GB Storage - 2vCPU ⚡</h3>
After the script completes, If you're dissatisfied with the default settings, click on the LXC, then on the **_Resources_** tab and change the settings to what you desire. Changes are immediate.
**Portainer Interface - IP:9000** **Portainer Interface - IP:9000**
⚙️ **To Update** ⚙️ **To Update**
@ -1262,7 +1260,7 @@ ________________________________________________________________________________
<details> <details>
<summary markdown="span"> PhotoPrism LXC </summary> <summary markdown="span"> 🔸PhotoPrism LXC </summary>
<p align="center"><img src="https://github.com/tteck/Proxmox/blob/main/misc/images/photoprism.png?raw=true" height="100"/></p> <p align="center"><img src="https://github.com/tteck/Proxmox/blob/main/misc/images/photoprism.png?raw=true" height="100"/></p>
@ -1270,16 +1268,14 @@ ________________________________________________________________________________
PhotoPrism® is an AI-powered app for browsing, organizing & sharing your photo collection. PhotoPrism® is an AI-powered app for browsing, organizing & sharing your photo collection.
To create a new Proxmox PhotoPrism LXC, run the following in the Proxmox Shell (V2). To create a new Proxmox PhotoPrism LXC, run the following in the Proxmox Shell.
``` ```
bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/photoprism.sh)" bash -c "$(wget -qLO - https://github.com/tteck/Proxmox/raw/main/ct/photoprism-v3.sh)"
``` ```
<h3 align="center" id="heading">⚡ Default Settings: 2GB RAM - 8GB Storage - 2vCPU ⚡</h3> <h3 align="center" id="heading">⚡ Default Settings: 2GB RAM - 8GB Storage - 2vCPU ⚡</h3>
After the script completes, If you're dissatisfied with the default settings, click on the LXC, then on the **_Resources_** tab and change the settings to what you desire. Changes are immediate.
**PhotoPrism Interface - IP:2342** **PhotoPrism Interface - IP:2342**
⚙️ **Initial Login** ⚙️ **Initial Login**

298
ct/docker-v3.sh Normal file
View file

@ -0,0 +1,298 @@
#!/usr/bin/env bash -ex
set -euo pipefail
shopt -s inherit_errexit nullglob
NEXTID=$(pvesh get /cluster/nextid)
INTEGER='^[0-9]+$'
YW=`echo "\033[33m"`
BL=`echo "\033[36m"`
RD=`echo "\033[01;31m"`
BGN=`echo "\033[4;92m"`
GN=`echo "\033[1;92m"`
DGN=`echo "\033[32m"`
CL=`echo "\033[m"`
BFR="\\r\\033[K"
HOLD="-"
CM="${GN}${CL}"
APP="Docker"
NSAPP=$(echo ${APP,,} | tr -d ' ')
while true; do
read -p "This will create a New ${APP} LXC. Proceed(y/n)?" yn
case $yn in
[Yy]* ) break;;
[Nn]* ) exit;;
* ) echo "Please answer yes or no.";;
esac
done
clear
function header_info {
echo -e "${BL}
_____ _
| __ \ | |
| | | | ___ ___| | _____ _ __
| |v3| |/ _ \ / __| |/ / _ \ __|
| |__| | (_) | (__| < __/ |
|_____/ \___/ \___|_|\_\___|_|
${CL}"
}
header_info
function msg_info() {
local msg="$1"
echo -ne " ${HOLD} ${YW}${msg}..."
}
function msg_ok() {
local msg="$1"
echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
}
function PVE_CHECK() {
PVE=$(pveversion | grep "pve-manager/7" | wc -l)
if [[ $PVE != 1 ]]; then
echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
echo -e "Exiting..."
sleep 2
exit
fi
}
function default_settings() {
clear
header_info
echo -e "${BL}Using Default Settings${CL}"
echo -e "${DGN}Using CT Type ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
CT_TYPE="1"
echo -e "${DGN}Using CT Password ${BGN}Automatic Login${CL}"
PW=" "
echo -e "${DGN}Using ID ${BGN}$NEXTID${CL}"
CT_ID=$NEXTID
echo -e "${DGN}Using CT Name ${BGN}$NSAPP${CL}"
HN=$NSAPP
echo -e "${DGN}Using Disk Size ${BGN}4GB${CL}"
DISK_SIZE="4"
echo -e "${DGN}Using ${BGN}2vCPU${CL}"
CORE_COUNT="2"
echo -e "${DGN}Using ${BGN}2048MiB${CL}${DGN} RAM${CL}"
RAM_SIZE="2048"
echo -e "${DGN}Using IP Address ${BGN}DHCP${CL}"
NET=dhcp
echo -e "${DGN}Using VLAN Tag ${BGN}NONE${CL}"
VLAN=" "
}
function advanced_settings() {
clear
header_info
echo -e "${RD}Using Advanced Settings${CL}"
echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})"
read CT_TYPE1
if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1";
echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}"
else
CT_TYPE1="Privileged"
CT_TYPE="0"
echo -en "${DGN}Set CT Type ${BL}Privileged${CL}"
fi;
echo -e " ${CM}${CL} \r"
sleep 1
clear
header_info
echo -e "${RD}Using Advanced Settings${CL}"
echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}"
echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login "
read PW1
if [ -z $PW1 ]; then PW1="Automatic Login" PW=" ";
echo -en "${DGN}Set CT ${BL}$PW1${CL}"
else
PW="-password $PW1"
echo -en "${DGN}Set CT Password ${BL}$PW1${CL}"
fi;
echo -e " ${CM}${CL} \r"
sleep 1
clear
header_info
echo -e "${RD}Using Advanced Settings${CL}"
echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}"
echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
echo -e "${YW}Enter the CT ID, or Press [ENTER] to automatically generate (${NEXTID}) "
read CT_ID
if [ -z $CT_ID ]; then CT_ID=$NEXTID; fi;
echo -en "${DGN}Set CT ID To ${BL}$CT_ID${CL}"
echo -e " ${CM}${CL} \r"
sleep 1
clear
header_info
echo -e "${RD}Using Advanced Settings${CL}"
echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}"
echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
echo -e "${DGN}Using ID ${BGN}$CT_ID${CL}"
echo -e "${YW}Enter CT Name (no-spaces), or Press [ENTER] for Default: $NSAPP "
read CT_NAME
if [ -z $CT_NAME ]; then
HN=$NSAPP
else
HN=$(echo ${CT_NAME,,} | tr -d ' ')
fi
echo -en "${DGN}Set CT Name To ${BL}$HN${CL}"
echo -e " ${CM}${CL} \r"
sleep 1
clear
header_info
echo -e "${RD}Using Advanced Settings${CL}"
echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}"
echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
echo -e "${DGN}Using ID ${BGN}$CT_ID${CL}"
echo -e "${DGN}Using CT Name ${BGN}$HN${CL}"
echo -e "${YW}Enter a Disk Size, or Press [ENTER] for Default: 4Gb "
read DISK_SIZE
if [ -z $DISK_SIZE ]; then DISK_SIZE="4"; fi;
if ! [[ $DISK_SIZE =~ $INTEGER ]] ; then echo "ERROR! DISK SIZE MUST HAVE INTEGER NUMBER!"; exit; fi;
echo -en "${DGN}Set Disk Size To ${BL}$DISK_SIZE${CL}"
echo -e " ${CM}${CL} \r"
sleep 1
clear
header_info
echo -e "${RD}Using Advanced Settings${CL}"
echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}"
echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
echo -e "${DGN}Using ID ${BGN}$CT_ID${CL}"
echo -e "${DGN}Using CT Name ${BGN}$HN${CL}"
echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}"
echo -e "${YW}Allocate CPU cores, or Press [ENTER] for Default: 2 "
read CORE_COUNT
if [ -z $CORE_COUNT ]; then CORE_COUNT="2"; fi;
echo -en "${DGN}Set Cores To ${BL}$CORE_COUNT${CL}"
echo -e " ${CM}${CL} \r"
sleep 1
clear
header_info
echo -e "${RD}Using Advanced Settings${CL}"
echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}"
echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
echo -e "${DGN}Using ID ${BGN}$CT_ID${CL}"
echo -e "${DGN}Using CT Name ${BGN}$HN${CL}"
echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}"
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
echo -e "${YW}Allocate RAM in MiB, or Press [ENTER] for Default: 2048 "
read RAM_SIZE
if [ -z $RAM_SIZE ]; then RAM_SIZE="2048"; fi;
echo -en "${DGN}Set RAM To ${BL}$RAM_SIZE${CL}"
echo -e " ${CM}${CL} \n"
sleep 1
clear
header_info
echo -e "${RD}Using Advanced Settings${CL}"
echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}"
echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
echo -e "${DGN}Using ID ${BGN}$CT_ID${CL}"
echo -e "${DGN}Using CT Name ${BGN}$HN${CL}"
echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}"
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
echo -e "${YW}Enter a IP Address, or Press [ENTER] for Default: DHCP "
read NET
if [ -z $NET ]; then NET="dhcp"; fi;
echo -en "${DGN}Set IP Address To ${BL}$NET${CL}"
echo -e " ${CM}${CL} \n"
sleep 1
clear
header_info
echo -e "${RD}Using Advanced Settings${CL}"
echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}"
echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
echo -e "${DGN}Using ID ${BGN}$CT_ID${CL}"
echo -e "${DGN}Using CT Name ${BGN}$HN${CL}"
echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}"
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
echo -e "${DGN}Using IP Address ${BGN}$NET${CL}"
echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE "
read VLAN1
if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=" ";
echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}"
else
VLAN="-tag $VLAN1"
echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}"
fi;
echo -e " ${CM}${CL} \n"
sleep 1
clear
header_info
echo -e "${RD}Using Advanced Settings${CL}"
echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}"
echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
echo -e "${DGN}Using ID ${BGN}$CT_ID${CL}"
echo -e "${DGN}Using CT Name ${BGN}$HN${CL}"
echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}"
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
echo -e "${DGN}Using IP Address ${BGN}$NET${CL}"
echo -e "${DGN}Using VLAN Tag ${BGN}$VLAN1${CL}"
read -p "Are these settings correct(y/n)? " -n 1 -r
echo
if [[ ! $REPLY =~ ^[Yy]$ ]]
then
advanced_settings
fi
}
function start_script() {
echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings "
read SETTINGS
if [ -z $SETTINGS ]; then default_settings;
else
advanced_settings
fi;
}
PVE_CHECK
start_script
if [ "$CT_TYPE" == "1" ]; then
FEATURES="nesting=1,keyctl=1"
else
FEATURES="nesting=1"
fi
TEMP_DIR=$(mktemp -d)
pushd $TEMP_DIR >/dev/null
export CTID=$CT_ID
export PCT_OSTYPE=debian
export PCT_OSVERSION=11
export PCT_DISK_SIZE=$DISK_SIZE
export PCT_OPTIONS="
-features $FEATURES
-hostname $HN
-net0 name=eth0,bridge=vmbr0,ip=$NET
$VLAN
-onboot 1
-cores $CORE_COUNT
-memory $RAM_SIZE
-unprivileged $CT_TYPE
$PW
"
bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
STORAGE_TYPE=$(pvesm status -storage $(pct config $CTID | grep rootfs | awk -F ":" '{print $2}') | awk 'NR>1 {print $2}')
if [ "$STORAGE_TYPE" == "zfspool" ]; then
echo -e "${RD}Some applications may not work properly due to ZFS not supporting 'fallocate'.${CL}"
fi
LXC_CONFIG=/etc/pve/lxc/${CTID}.conf
cat <<EOF >> $LXC_CONFIG
lxc.cgroup2.devices.allow: a
lxc.cap.drop:
EOF
msg_info "Starting LXC Container"
pct start $CTID
msg_ok "Started LXC Container"
lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/setup/docker-install.sh)" || exit
IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
msg_ok "Completed Successfully!\n"

295
ct/photoprism-v3.sh Normal file
View file

@ -0,0 +1,295 @@
#!/usr/bin/env bash -ex
set -euo pipefail
shopt -s inherit_errexit nullglob
NEXTID=$(pvesh get /cluster/nextid)
INTEGER='^[0-9]+$'
PP=`echo "\e[1;35m"`
YW=`echo "\033[33m"`
BL=`echo "\033[36m"`
RD=`echo "\033[01;31m"`
BGN=`echo "\033[4;92m"`
GN=`echo "\033[1;92m"`
DGN=`echo "\033[32m"`
CL=`echo "\033[m"`
BFR="\\r\\033[K"
HOLD="-"
CM="${GN}${CL}"
APP="PhotoPrism"
NSAPP=$(echo ${APP,,} | tr -d ' ')
while true; do
read -p "This will create a New ${APP} LXC. Proceed(y/n)?" yn
case $yn in
[Yy]* ) break;;
[Nn]* ) exit;;
* ) echo "Please answer yes or no.";;
esac
done
clear
function header_info {
echo -e "${PP}
_____ _ _ _____ _
| __ \| | | | | __ \ (_)
| |__) | |__ ___ | |_ ___ | |__) | __ _ ___ _ __ ___
| ___/| _ \ / _ \| __/ _ \| ___/ __| / __| _ _ \
| | | | | | (_) | || (_) | | | | | \__ \ | | | | |
|_| v3 |_| |_|\___/ \__\___/|_| |_| |_|___/_| |_| |_|
${CL}"
}
header_info
function msg_info() {
local msg="$1"
echo -ne " ${HOLD} ${YW}${msg}..."
}
function msg_ok() {
local msg="$1"
echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
}
function PVE_CHECK() {
PVE=$(pveversion | grep "pve-manager/7" | wc -l)
if [[ $PVE != 1 ]]; then
echo -e "${RD}This script requires Proxmox Virtual Environment 7.0 or greater${CL}"
echo -e "Exiting..."
sleep 2
exit
fi
}
function default_settings() {
clear
header_info
echo -e "${BL}Using Default Settings${CL}"
echo -e "${DGN}Using CT Type ${BGN}Unprivileged${CL} ${RD}NO DEVICE PASSTHROUGH${CL}"
CT_TYPE="1"
echo -e "${DGN}Using CT Password ${BGN}Automatic Login${CL}"
PW=" "
echo -e "${DGN}Using ID ${BGN}$NEXTID${CL}"
CT_ID=$NEXTID
echo -e "${DGN}Using CT Name ${BGN}$NSAPP${CL}"
HN=$NSAPP
echo -e "${DGN}Using Disk Size ${BGN}8GB${CL}"
DISK_SIZE="8"
echo -e "${DGN}Using ${BGN}2vCPU${CL}"
CORE_COUNT="2"
echo -e "${DGN}Using ${BGN}2048MiB${CL}${DGN} RAM${CL}"
RAM_SIZE="2048"
echo -e "${DGN}Using IP Address ${BGN}DHCP${CL}"
NET=dhcp
echo -e "${DGN}Using VLAN Tag ${BGN}NONE${CL}"
VLAN=" "
}
function advanced_settings() {
clear
header_info
echo -e "${RD}Using Advanced Settings${CL}"
echo -e "${YW}Type Privileged, or Press [ENTER] for Default: Unprivileged (${RD}NO DEVICE PASSTHROUGH${CL}${YW})"
read CT_TYPE1
if [ -z $CT_TYPE1 ]; then CT_TYPE1="Unprivileged" CT_TYPE="1";
echo -en "${DGN}Set CT Type ${BL}$CT_TYPE1${CL}"
else
CT_TYPE1="Privileged"
CT_TYPE="0"
echo -en "${DGN}Set CT Type ${BL}Privileged${CL}"
fi;
echo -e " ${CM}${CL} \r"
sleep 1
clear
header_info
echo -e "${RD}Using Advanced Settings${CL}"
echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}"
echo -e "${YW}Set Password, or Press [ENTER] for Default: Automatic Login "
read PW1
if [ -z $PW1 ]; then PW1="Automatic Login" PW=" ";
echo -en "${DGN}Set CT ${BL}$PW1${CL}"
else
PW="-password $PW1"
echo -en "${DGN}Set CT Password ${BL}$PW1${CL}"
fi;
echo -e " ${CM}${CL} \r"
sleep 1
clear
header_info
echo -e "${RD}Using Advanced Settings${CL}"
echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}"
echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
echo -e "${YW}Enter the CT ID, or Press [ENTER] to automatically generate (${NEXTID}) "
read CT_ID
if [ -z $CT_ID ]; then CT_ID=$NEXTID; fi;
echo -en "${DGN}Set CT ID To ${BL}$CT_ID${CL}"
echo -e " ${CM}${CL} \r"
sleep 1
clear
header_info
echo -e "${RD}Using Advanced Settings${CL}"
echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}"
echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
echo -e "${DGN}Using ID ${BGN}$CT_ID${CL}"
echo -e "${YW}Enter CT Name (no-spaces), or Press [ENTER] for Default: $NSAPP "
read CT_NAME
if [ -z $CT_NAME ]; then
HN=$NSAPP
else
HN=$(echo ${CT_NAME,,} | tr -d ' ')
fi
echo -en "${DGN}Set CT Name To ${BL}$HN${CL}"
echo -e " ${CM}${CL} \r"
sleep 1
clear
header_info
echo -e "${RD}Using Advanced Settings${CL}"
echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}"
echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
echo -e "${DGN}Using ID ${BGN}$CT_ID${CL}"
echo -e "${DGN}Using CT Name ${BGN}$HN${CL}"
echo -e "${YW}Enter a Disk Size, or Press [ENTER] for Default: 8Gb "
read DISK_SIZE
if [ -z $DISK_SIZE ]; then DISK_SIZE="8"; fi;
if ! [[ $DISK_SIZE =~ $INTEGER ]] ; then echo "ERROR! DISK SIZE MUST HAVE INTEGER NUMBER!"; exit; fi;
echo -en "${DGN}Set Disk Size To ${BL}$DISK_SIZE${CL}"
echo -e " ${CM}${CL} \r"
sleep 1
clear
header_info
echo -e "${RD}Using Advanced Settings${CL}"
echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}"
echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
echo -e "${DGN}Using ID ${BGN}$CT_ID${CL}"
echo -e "${DGN}Using CT Name ${BGN}$HN${CL}"
echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}"
echo -e "${YW}Allocate CPU cores, or Press [ENTER] for Default: 2 "
read CORE_COUNT
if [ -z $CORE_COUNT ]; then CORE_COUNT="2"; fi;
echo -en "${DGN}Set Cores To ${BL}$CORE_COUNT${CL}"
echo -e " ${CM}${CL} \r"
sleep 1
clear
header_info
echo -e "${RD}Using Advanced Settings${CL}"
echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}"
echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
echo -e "${DGN}Using ID ${BGN}$CT_ID${CL}"
echo -e "${DGN}Using CT Name ${BGN}$HN${CL}"
echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}"
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
echo -e "${YW}Allocate RAM in MiB, or Press [ENTER] for Default: 2048 "
read RAM_SIZE
if [ -z $RAM_SIZE ]; then RAM_SIZE="2048"; fi;
echo -en "${DGN}Set RAM To ${BL}$RAM_SIZE${CL}"
echo -e " ${CM}${CL} \n"
sleep 1
clear
header_info
echo -e "${RD}Using Advanced Settings${CL}"
echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}"
echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
echo -e "${DGN}Using ID ${BGN}$CT_ID${CL}"
echo -e "${DGN}Using CT Name ${BGN}$HN${CL}"
echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}"
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
echo -e "${YW}Enter a IP Address, or Press [ENTER] for Default: DHCP "
read NET
if [ -z $NET ]; then NET="dhcp"; fi;
echo -en "${DGN}Set IP Address To ${BL}$NET${CL}"
echo -e " ${CM}${CL} \n"
sleep 1
clear
header_info
echo -e "${RD}Using Advanced Settings${CL}"
echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}"
echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
echo -e "${DGN}Using ID ${BGN}$CT_ID${CL}"
echo -e "${DGN}Using CT Name ${BGN}$HN${CL}"
echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}"
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
echo -e "${DGN}Using IP Address ${BGN}$NET${CL}"
echo -e "${YW}Enter a VLAN Tag, or Press [ENTER] for Default: NONE "
read VLAN1
if [ -z $VLAN1 ]; then VLAN1="NONE" VLAN=" ";
echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}"
else
VLAN="-tag $VLAN1"
echo -en "${DGN}Set VLAN Tag To ${BL}$VLAN1${CL}"
fi;
echo -e " ${CM}${CL} \n"
sleep 1
clear
header_info
echo -e "${RD}Using Advanced Settings${CL}"
echo -e "${DGN}Using CT Type ${BGN}$CT_TYPE1${CL}"
echo -e "${DGN}Using CT Password ${BGN}$PW1${CL}"
echo -e "${DGN}Using ID ${BGN}$CT_ID${CL}"
echo -e "${DGN}Using CT Name ${BGN}$HN${CL}"
echo -e "${DGN}Using Disk Size ${BGN}$DISK_SIZE${CL}"
echo -e "${DGN}Using ${BGN}${CORE_COUNT}vCPU${CL}"
echo -e "${DGN}Using ${BGN}${RAM_SIZE}MiB${CL}${DGN} RAM${CL}"
echo -e "${DGN}Using IP Address ${BGN}$NET${CL}"
echo -e "${DGN}Using VLAN Tag ${BGN}$VLAN1${CL}"
read -p "Are these settings correct(y/n)? " -n 1 -r
echo
if [[ ! $REPLY =~ ^[Yy]$ ]]
then
advanced_settings
fi
}
function start_script() {
echo -e "${YW}Type Advanced, or Press [ENTER] for Default Settings "
read SETTINGS
if [ -z $SETTINGS ]; then default_settings;
else
advanced_settings
fi;
}
start_script
if [ "$CT_TYPE" == "1" ]; then
FEATURES="nesting=1,keyctl=1"
else
FEATURES="nesting=1"
fi
TEMP_DIR=$(mktemp -d)
pushd $TEMP_DIR >/dev/null
export CTID=$CT_ID
export PCT_OSTYPE=debian
export PCT_OSVERSION=11
export PCT_DISK_SIZE=$DISK_SIZE
export PCT_OPTIONS="
-features $FEATURES
-hostname $HN
-net0 name=eth0,bridge=vmbr0,ip=$NET
$VLAN
-onboot 1
-cores $CORE_COUNT
-memory $RAM_SIZE
-unprivileged $CT_TYPE
$PW
"
bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/ct/create_lxc.sh)" || exit
STORAGE_TYPE=$(pvesm status -storage $(pct config $CTID | grep rootfs | awk -F ":" '{print $2}') | awk 'NR>1 {print $2}')
if [ "$STORAGE_TYPE" == "zfspool" ]; then
echo -e "${RD}Some applications may not work properly due to ZFS not supporting 'fallocate'.${CL}"
fi
msg_info "Starting LXC Container"
pct start $CTID
msg_ok "Started LXC Container"
lxc-attach -n $CTID -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/tteck/Proxmox/main/setup/photoprism-install.sh)" || exit
IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}')
msg_ok "Completed Successfully!\n"
echo -e "${APP} should be reachable by going to the following URL.
${BL}http://${IP}:2342${CL} \n"

View file

@ -1,38 +1,30 @@
#!/usr/bin/env bash #!/usr/bin/env bash -ex
set -euo pipefail
set -o errexit shopt -s inherit_errexit nullglob
set -o errtrace YW=`echo "\033[33m"`
set -o nounset
set -o pipefail
shopt -s expand_aliases
alias die='EXIT=$? LINE=$LINENO error_exit'
trap die ERR
trap 'die "Script interrupted."' INT
function error_exit() {
trap - ERR
local DEFAULT='Unknown failure occured.'
local REASON="\e[97m${1:-$DEFAULT}\e[39m"
local FLAG="\e[91m[ERROR:LXC] \e[93m$EXIT@$LINE"
msg "$FLAG $REASON"
exit $EXIT
}
function msg() {
local TEXT="$1"
echo -e "$TEXT"
}
RD=`echo "\033[01;31m"` RD=`echo "\033[01;31m"`
BL=`echo "\033[36m"` BL=`echo "\033[36m"`
GN=`echo "\033[1;92m"` GN=`echo "\033[1;92m"`
CL=`echo "\033[m"` CL=`echo "\033[m"`
CM="${GN}${CL}"
CROSS="${RD}${CL}"
RETRY_NUM=10 RETRY_NUM=10
RETRY_EVERY=3 RETRY_EVERY=3
NUM=$RETRY_NUM NUM=$RETRY_NUM
CM="${GN}${CL}"
CROSS="${RD}${CL}"
BFR="\\r\\033[K"
HOLD="-"
echo -en "${GN} Setting up Container OS... " function msg_info() {
local msg="$1"
echo -ne " ${HOLD} ${YW}${msg}..."
}
function msg_ok() {
local msg="$1"
echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
}
msg_info "Setting up Container OS "
sed -i "/$LANG/ s/\(^# \)//" /etc/locale.gen sed -i "/$LANG/ s/\(^# \)//" /etc/locale.gen
locale-gen >/dev/null locale-gen >/dev/null
while [ "$(hostname -I)" = "" ]; do while [ "$(hostname -I)" = "" ]; do
@ -45,19 +37,18 @@ while [ "$(hostname -I)" = "" ]; do
exit 1 exit 1
fi fi
done done
echo -e "${CM}${CL} \r" msg_ok "Set up Container OS"
echo -en "${GN} Network Connected: ${BL}$(hostname -I)${CL} " msg_ok "Network Connected: ${BL}$(hostname -I)"
echo -e "${CM}${CL} \r"
echo -en "${GN} Updating Container OS... " msg_info "Updating Container OS"
apt update &>/dev/null apt update &>/dev/null
apt-get -qqy upgrade &>/dev/null apt-get -qqy upgrade &>/dev/null
echo -e "${CM}${CL} \r" msg_ok "Updated Container OS"
echo -en "${GN} Installing Dependencies... " msg_info "Installing Dependencies"
apt-get install -y curl &>/dev/null apt-get install -y curl &>/dev/null
apt-get install -y sudo &>/dev/null apt-get install -y sudo &>/dev/null
echo -e "${CM}${CL} \r" msg_ok "Installed Dependencies"
get_latest_release() { get_latest_release() {
curl -sL https://api.github.com/repos/$1/releases/latest | grep '"tag_name":' | cut -d'"' -f4 curl -sL https://api.github.com/repos/$1/releases/latest | grep '"tag_name":' | cut -d'"' -f4
@ -67,7 +58,7 @@ DOCKER_LATEST_VERSION=$(get_latest_release "moby/moby")
PORTAINER_LATEST_VERSION=$(get_latest_release "portainer/portainer") PORTAINER_LATEST_VERSION=$(get_latest_release "portainer/portainer")
DOCKER_COMPOSE_LATEST_VERSION=$(get_latest_release "docker/compose") DOCKER_COMPOSE_LATEST_VERSION=$(get_latest_release "docker/compose")
echo -en "${GN} Installing Docker $DOCKER_LATEST_VERSION... " msg_info "Installing Docker $DOCKER_LATEST_VERSION"
DOCKER_CONFIG_PATH='/etc/docker/daemon.json' DOCKER_CONFIG_PATH='/etc/docker/daemon.json'
mkdir -p $(dirname $DOCKER_CONFIG_PATH) mkdir -p $(dirname $DOCKER_CONFIG_PATH)
cat >$DOCKER_CONFIG_PATH <<'EOF' cat >$DOCKER_CONFIG_PATH <<'EOF'
@ -76,7 +67,7 @@ cat >$DOCKER_CONFIG_PATH <<'EOF'
} }
EOF EOF
sh <(curl -sSL https://get.docker.com) &>/dev/null sh <(curl -sSL https://get.docker.com) &>/dev/null
echo -e "${CM}${CL} \r" msg_ok "Installed Docker $DOCKER_LATEST_VERSION"
read -r -p "Would you like to add Portainer? <Y/n> " prompt read -r -p "Would you like to add Portainer? <Y/n> " prompt
if [[ $prompt == "y" || $prompt == "Y" || $prompt == "yes" || $prompt == "Yes" ]] if [[ $prompt == "y" || $prompt == "Y" || $prompt == "yes" || $prompt == "Yes" ]]
@ -87,7 +78,7 @@ PORTAINER="N"
fi fi
if [[ $PORTAINER == "Y" ]]; then if [[ $PORTAINER == "Y" ]]; then
echo -en "${GN} Installing Portainer $PORTAINER_LATEST_VERSION... " msg_info "Installing Portainer $PORTAINER_LATEST_VERSION"
docker volume create portainer_data >/dev/null docker volume create portainer_data >/dev/null
docker run -d \ docker run -d \
-p 8000:8000 \ -p 8000:8000 \
@ -97,7 +88,7 @@ docker run -d \
-v /var/run/docker.sock:/var/run/docker.sock \ -v /var/run/docker.sock:/var/run/docker.sock \
-v portainer_data:/data \ -v portainer_data:/data \
portainer/portainer-ce:latest &>/dev/null portainer/portainer-ce:latest &>/dev/null
echo -e "${CM}${CL} \r" msg_ok "Installed Portainer $PORTAINER_LATEST_VERSION"
fi fi
read -r -p "Would you like to add Docker Compose? <Y/n> " prompt read -r -p "Would you like to add Docker Compose? <Y/n> " prompt
@ -109,17 +100,17 @@ DOCKER_COMPOSE="N"
fi fi
if [[ $DOCKER_COMPOSE == "Y" ]]; then if [[ $DOCKER_COMPOSE == "Y" ]]; then
echo -en "${GN} Installing Docker Compose $DOCKER_COMPOSE_LATEST_VERSION... " msg_info "Installing Docker Compose $DOCKER_COMPOSE_LATEST_VERSION"
DOCKER_CONFIG=${DOCKER_CONFIG:-$HOME/.docker} DOCKER_CONFIG=${DOCKER_CONFIG:-$HOME/.docker}
mkdir -p $DOCKER_CONFIG/cli-plugins mkdir -p $DOCKER_CONFIG/cli-plugins
curl -sSL https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_LATEST_VERSION/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose curl -sSL https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_LATEST_VERSION/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose
chmod +x $DOCKER_CONFIG/cli-plugins/docker-compose chmod +x $DOCKER_CONFIG/cli-plugins/docker-compose
echo -e "${CM}${CL} \r" msg_ok "Installed Docker Compose $DOCKER_COMPOSE_LATEST_VERSION"
fi fi
PASS=$(grep -w "root" /etc/shadow | cut -b6); PASS=$(grep -w "root" /etc/shadow | cut -b6);
if [[ $PASS != $ ]]; then if [[ $PASS != $ ]]; then
echo -en "${GN} Customizing Container... " msg_info "Customizing Container"
rm /etc/motd rm /etc/motd
rm /etc/update-motd.d/10-uname rm /etc/update-motd.d/10-uname
touch ~/.hushlogin touch ~/.hushlogin
@ -132,11 +123,11 @@ ExecStart=-/sbin/agetty --autologin root --noclear --keep-baud tty%I 115200,3840
EOF EOF
systemctl daemon-reload systemctl daemon-reload
systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//')
echo -e "${CM}${CL} \r" msg_ok "Customized Container"
fi fi
echo -en "${GN} Cleanup... " msg_info "Cleaning up"
apt-get autoremove >/dev/null apt-get autoremove >/dev/null
apt-get autoclean >/dev/null apt-get autoclean >/dev/null
rm -rf /var/{cache,log}/* /var/lib/apt/lists/* rm -rf /var/{cache,log}/* /var/lib/apt/lists/*
echo -e "${CM}${CL} \n" msg_ok "Cleaned"

View file

@ -1,37 +1,30 @@
#!/usr/bin/env bash #!/usr/bin/env bash -ex
set -o errexit set -euo pipefail
set -o errtrace shopt -s inherit_errexit nullglob
set -o nounset YW=`echo "\033[33m"`
set -o pipefail
shopt -s expand_aliases
alias die='EXIT=$? LINE=$LINENO error_exit'
trap die ERR
trap 'die "Script interrupted."' INT
function error_exit() {
trap - ERR
local DEFAULT='Unknown failure occured.'
local REASON="\e[97m${1:-$DEFAULT}\e[39m"
local FLAG="\e[91m[ERROR:LXC] \e[93m$EXIT@$LINE"
msg "$FLAG $REASON"
exit $EXIT
}
function msg() {
local TEXT="$1"
echo -e "$TEXT"
}
RD=`echo "\033[01;31m"` RD=`echo "\033[01;31m"`
BL=`echo "\033[36m"` BL=`echo "\033[36m"`
GN=`echo "\033[1;92m"` GN=`echo "\033[1;92m"`
CL=`echo "\033[m"` CL=`echo "\033[m"`
CM="${GN}${CL}"
CROSS="${RD}${CL}"
RETRY_NUM=10 RETRY_NUM=10
RETRY_EVERY=3 RETRY_EVERY=3
NUM=$RETRY_NUM NUM=$RETRY_NUM
CM="${GN}${CL}"
CROSS="${RD}${CL}"
BFR="\\r\\033[K"
HOLD="-"
echo -en "${GN} Setting up Container OS... " function msg_info() {
local msg="$1"
echo -ne " ${HOLD} ${YW}${msg}..."
}
function msg_ok() {
local msg="$1"
echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
}
msg_info "Setting up Container OS "
sed -i "/$LANG/ s/\(^# \)//" /etc/locale.gen sed -i "/$LANG/ s/\(^# \)//" /etc/locale.gen
locale-gen >/dev/null locale-gen >/dev/null
while [ "$(hostname -I)" = "" ]; do while [ "$(hostname -I)" = "" ]; do
@ -44,16 +37,15 @@ while [ "$(hostname -I)" = "" ]; do
exit 1 exit 1
fi fi
done done
echo -e "${CM}${CL} \r" msg_ok "Set up Container OS"
echo -en "${GN} Network Connected: ${BL}$(hostname -I)${CL} " msg_ok "Network Connected: ${BL}$(hostname -I)"
echo -e "${CM}${CL} \r"
echo -en "${GN} Updating Container OS... " msg_info "Updating Container OS"
apt update &>/dev/null apt update &>/dev/null
apt-get -qqy upgrade &>/dev/null apt-get -qqy upgrade &>/dev/null
echo -e "${CM}${CL} \r" msg_ok "Updated Container OS"
echo -en "${GN} Installing Dependencies... " msg_info "Installing Dependencies"
apt-get install -y curl &>/dev/null apt-get install -y curl &>/dev/null
apt-get install -y sudo &>/dev/null apt-get install -y sudo &>/dev/null
apt-get install -y gcc &>/dev/null apt-get install -y gcc &>/dev/null
@ -63,23 +55,23 @@ apt-get install -y gnupg &>/dev/null
apt-get install -y make &>/dev/null apt-get install -y make &>/dev/null
apt-get install -y zip &>/dev/null apt-get install -y zip &>/dev/null
apt-get install -y unzip &>/dev/null apt-get install -y unzip &>/dev/null
echo -e "${CM}${CL} \r" msg_ok "Installed Dependencies"
echo -en "${GN} Setting up Node.js Repository... " msg_info "Setting up Node.js Repository"
sudo curl -sL https://deb.nodesource.com/setup_16.x | sudo -E bash - &>/dev/null sudo curl -sL https://deb.nodesource.com/setup_16.x | sudo -E bash - &>/dev/null
echo -e "${CM}${CL} \r" msg_ok "Set up Node.js Repository"
echo -en "${GN} Installing Node.js... " msg_info "Installing Node.js"
apt-get install -y nodejs &>/dev/null apt-get install -y nodejs &>/dev/null
echo -e "${CM}${CL} \r" msg_ok "Installed Node.js"
echo -en "${GN} Installing Golang... " msg_info "Installing Golang"
wget https://golang.org/dl/go1.18.linux-amd64.tar.gz &>/dev/null wget https://golang.org/dl/go1.18.linux-amd64.tar.gz &>/dev/null
tar -C /usr/local -xzf go1.18.linux-amd64.tar.gz &>/dev/null tar -C /usr/local -xzf go1.18.linux-amd64.tar.gz &>/dev/null
ln -s /usr/local/go/bin/go /usr/local/bin/go &>/dev/null ln -s /usr/local/go/bin/go /usr/local/bin/go &>/dev/null
echo -e "${CM}${CL} \r" msg_ok "Installed Golang"
echo -en "${GN} Installing Tensorflow... " msg_info "Installing Tensorflow"
AVX=$(grep -o -m1 'avx[^ ]*' /proc/cpuinfo) AVX=$(grep -o -m1 'avx[^ ]*' /proc/cpuinfo)
if [[ "$AVX" == "avx2" ]]; then if [[ "$AVX" == "avx2" ]]; then
wget https://dl.photoprism.org/tensorflow/linux/libtensorflow-linux-avx2-1.15.2.tar.gz &>/dev/null wget https://dl.photoprism.org/tensorflow/linux/libtensorflow-linux-avx2-1.15.2.tar.gz &>/dev/null
@ -94,21 +86,21 @@ if [[ "$AVX" == "avx2" ]]; then
tar -C /usr/local -xzf libtensorflow-linux-cpu-1.15.2.tar.gz &>/dev/null tar -C /usr/local -xzf libtensorflow-linux-cpu-1.15.2.tar.gz &>/dev/null
ldconfig &>/dev/null ldconfig &>/dev/null
fi fi
echo -e "${CM}${CL} \r" msg_ok "Installed Tensorflow"
echo -en "${GN} Cloning PhotoPrism... " msg_info "Cloning PhotoPrism"
mkdir -p /opt/photoprism/bin mkdir -p /opt/photoprism/bin
mkdir /var/lib/photoprism mkdir /var/lib/photoprism
git clone https://github.com/photoprism/photoprism.git &>/dev/null git clone https://github.com/photoprism/photoprism.git &>/dev/null
cd photoprism cd photoprism
git checkout release &>/dev/null git checkout release &>/dev/null
echo -e "${CM}${CL} \r" msg_ok "Cloned PhotoPrism"
echo -en "${GN} Building PhotoPrism... " msg_info "Building PhotoPrism"
make all &>/dev/null make all &>/dev/null
./scripts/build.sh prod /opt/photoprism/bin/photoprism &>/dev/null ./scripts/build.sh prod /opt/photoprism/bin/photoprism &>/dev/null
cp -a assets/ /opt/photoprism/assets/ &>/dev/null cp -a assets/ /opt/photoprism/assets/ &>/dev/null
echo -e "${CM}${CL} \r" msg_ok "Built PhotoPrism"
env_path="/var/lib/photoprism/.env" env_path="/var/lib/photoprism/.env"
echo " echo "
@ -118,7 +110,7 @@ PHOTOPRISM_ORIGINALS_PATH='/var/lib/photoprism/photos/Originals'
PHOTOPRISM_IMPORT_PATH='/var/lib/photoprism/photos/Import' PHOTOPRISM_IMPORT_PATH='/var/lib/photoprism/photos/Import'
" > $env_path " > $env_path
echo -en "${GN} Creating Service file photoprism.service... " msg_info "Creating Service"
service_path="/etc/systemd/system/photoprism.service" service_path="/etc/systemd/system/photoprism.service"
echo "[Unit] echo "[Unit]
@ -136,11 +128,11 @@ ExecStop=/opt/photoprism/bin/photoprism down
[Install] [Install]
WantedBy=multi-user.target" > $service_path WantedBy=multi-user.target" > $service_path
systemctl enable --now photoprism &>/dev/null systemctl enable --now photoprism &>/dev/null
echo -e "${CM}${CL} \r" msg_ok "Created Service"
PASS=$(grep -w "root" /etc/shadow | cut -b6); PASS=$(grep -w "root" /etc/shadow | cut -b6);
if [[ $PASS != $ ]]; then if [[ $PASS != $ ]]; then
echo -en "${GN} Customizing Container... " msg_info "Customizing Container"
rm /etc/motd rm /etc/motd
rm /etc/update-motd.d/10-uname rm /etc/update-motd.d/10-uname
touch ~/.hushlogin touch ~/.hushlogin
@ -153,11 +145,11 @@ ExecStart=-/sbin/agetty --autologin root --noclear --keep-baud tty%I 115200,3840
EOF EOF
systemctl daemon-reload systemctl daemon-reload
systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//') systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//')
echo -e "${CM}${CL} \r" msg_ok "Customized Container"
fi fi
echo -en "${GN} Cleanup... " msg_info "Cleaning up"
apt-get autoremove >/dev/null apt-get autoremove >/dev/null
apt-get autoclean >/dev/null apt-get autoclean >/dev/null
rm -rf /var/{cache,log}/* /var/lib/apt/lists/* /root/go rm -rf /var/{cache,log}/* /var/lib/apt/lists/*
echo -e "${CM}${CL} \n" msg_ok "Cleaned"