flynx/proxmox-utils
1
0
Fork 0
mirror of https://github.com/flynx/proxmox-utils.git synced 2025-12-17 09:01:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

added CT notes...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2024-01-18 03:29:51 +03:00
parent 038d150491
commit 709673d5d6
3 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.pct-helpers
View File

@ -493,6 +493,7 @@ readVars(){
# buildAssets [VAR ..] # buildAssets [VAR ..]
# #
# XXX revise: SKIP handling... # XXX revise: SKIP handling...
README=README.md
buildAssets(){ buildAssets(){
local template_dir=${TEMPLATE_DIR:-templates} local template_dir=${TEMPLATE_DIR:-templates}
local assets_dir=${ASSETS_DIR:-assets} local assets_dir=${ASSETS_DIR:-assets}
@ -564,6 +565,12 @@ buildAssets(){
| eval "sed ${PATTERNS[@]}" \ | eval "sed ${PATTERNS[@]}" \
> "${assets_dir}/${file}" > "${assets_dir}/${file}"
done done
# special case: README.md...
if [ -z "$DESCRIPTION" ] && [ -e "$README" ] ; then
DESCRIPTION="$(\
cat ${README} \
| eval "sed ${PATTERNS[@]}")"
fi
} }
@ -653,7 +660,8 @@ pctUpdateTurnkey(){
pctSet(){ pctSet(){
[ "$2" ] \ [ "$2" ] \
&& @ pct set $1 \ && @ pct set $1 \
${2} ${2} \
"${DESCRIPTION:+--description \""${DESCRIPTION}"\"}"
[ "$3" ] \ [ "$3" ] \
&& @ pct reboot $1 && @ pct reboot $1
} }

5
nextcloud/README.md Normal file
View File

@ -0,0 +1,5 @@
# Nextcloud
Hostname: `${CTHOSTNAME}`

24
nextcloud/make.sh
View File

@ -27,13 +27,12 @@ DFL_RAM=${DFL_RAM:=2048}
DFL_SWAP=${DFL_SWAP:=${DFL_RAM}} DFL_SWAP=${DFL_SWAP:=${DFL_RAM}}
DFL_DRIVE=${DFL_DRIVE:=40} DFL_DRIVE=${DFL_DRIVE:=40}
# Nextcloud-specific configuration... # XXX do we request these???
#APP_DOMAIN=nc.$DOMAIN GATE_LAN_IP=${GATE_LAN_IP:-${DFL_GATE_LAN_IP}}
#DB_PASS= GATE_HOSTNAME=${GATE_HOSTNAME:-${DFL_GATE_HOSTNAME}}
#APP_PASS= WAN_IP=${WAN_IP:-${DFL_WAN_IP}}
#SEC_ALERTS=SKIP
WAN_IP=SKIP #WAN_IP=SKIP
WAN_GATE=SKIP WAN_GATE=SKIP
ADMIN_IP=SKIP ADMIN_IP=SKIP
ADMIN_GATE=SKIP ADMIN_GATE=SKIP
@ -46,6 +45,9 @@ readVars
# Nextcloud-specific configuration... # Nextcloud-specific configuration...
APP_DOMAIN=$DOMAIN APP_DOMAIN=$DOMAIN
#DB_PASS=
#APP_PASS=
#SEC_ALERTS=SKIP
#---------------------------------------------------------------------- #----------------------------------------------------------------------
@ -92,26 +94,26 @@ echo "# Updating config..."
# add gate IP to trusted_proxies... # add gate IP to trusted_proxies...
@ lxc-attach $ID -- bash -c "\ @ lxc-attach $ID -- bash -c "\
sed -i \ sed -i \
-e \"/trusted_domains/i\\ 'trusted_proxies' =>\\n array (\\n '${GATE_LAN_IP/\/*}\\/32',\\n ),\" \ -e \"/trusted_domains/i\\ 'trusted_proxies' =>\\n array (\\n 0 => '${GATE_LAN_IP/\/*}\\/32',\\n ),\" \
/var/www/nextcloud/config/config.php" /var/www/nextcloud/config/config.php"
# add self IP to trusted_domains -- enable setup from local network... # add self IP to trusted_domains -- enable setup from local network...
# XXX the gate stuff might not be needed...
# XXX is the IP actually needed??? # XXX is the IP actually needed???
IP=$([ -z $DRY_RUN ] && lxc-attach $ID -- hostname -I) IP=$([ -z $DRY_RUN ] && lxc-attach $ID -- hostname -I)
# XXX the gate stuff might not be needed...
TRUSTED_DOMAINS=( TRUSTED_DOMAINS=(
"${IP/ *}" "${IP/ *}"
"$CTHOSTNAME" "$CTHOSTNAME"
"${CTHOSTNAME}.srv" "${CTHOSTNAME}.srv"
"${GATE_LAN_IPn}" "${GATE_LAN_IP/\/*}"
"${GATE_HOSTNAME}" "${GATE_HOSTNAME}"
"${GATE_HOSTNAME}.srv" "${GATE_HOSTNAME}.srv"
"${WAN_IPn}" "${WAN_IP/\/*}"
) )
ADDRS= ADDRS=
i=2 i=2
for addr in "${TRUSTED_DOMAINS[@]}" ; do for addr in "${TRUSTED_DOMAINS[@]}" ; do
if [ -z "$addr" ] ; then if [ -z "$addr" ] || [[ "$addr" == ".srv" ]] ; then
continue continue
fi fi
ADDRS="${ADDRS}\ \ $i => '${addr//\//\\/}',\\n" ADDRS="${ADDRS}\ \ $i => '${addr//\//\\/}',\\n"