made the nextcloud setup semi-manual (testing)...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
...
2025-12-25 12:52:04 +00:00 · 2024-01-07 18:55:50 +03:00 · 2024-01-07 16:42:14 +03:00 · 2024-01-07 16:34:47 +03:00 · 2024-01-07 16:19:51 +03:00 · 2024-01-07 16:18:27 +03:00
9 changed files with 145 additions and 22 deletions
--- a/.pct-helpers
+++ b/.pct-helpers
@ -148,7 +148,8 @@ normpath(){
 #	https://pve.proxmox.com/wiki/Linux_Container
 getLatestTemplate(){
 	#IFS=$'\n'
-	local pattern=$1
+	#@ pveam update 
+
 	local templates=($(pveam available | grep -o ''${1}'.*$'))
 	local latest=${templates[-1]}

@ -198,6 +199,18 @@ xreadpass(){
 	fi
 }

+# 
+# 	readConfig
+# 
+readConfig(){
+	if [ -z $NO_DEFAULTS ] ; then
+		[ -e ../config.global ] \
+			&& source ../config.global
+		[ -e ./config ] \
+			&& source ./config
+	fi
+}
+
 #
 #	readVars
 #
@ -232,6 +245,7 @@ readVars(){
 	xread "Hostname: " CTHOSTNAME

 	# hardware...
+	xread "CPU cores: " CORES
 	xread "RAM (MB): " RAM
 	xread "SWAP (MB): " SWAP
 	xread "DRIVE (GB): " DRIVE
--- a/10
+++ b/10
@ -29,9 +29,17 @@ wireguard:
 syncthing: 
 	$@/make.sh

+.PHONY: nextcloud
+nextcloud: 
+	$@/make.sh
+
+.PHONY: gitea
+gitea: 
+	$@/make.sh
+

 .PHONY: all
-all: config gate ns ssh wireguard syncthing
+all: config gate ns ssh wireguard syncthing nextcloud gitea



--- a/gate-traefik/make.sh
+++ b/gate-traefik/make.sh
@ -12,11 +12,7 @@ source ../.pct-helpers

 #----------------------------------------------------------------------

-[ -e ../config.global ] \
-	&& source ../config.global
-
-[ -e ./config ] \
-	&& source ./config
+readConfig


 #----------------------------------------------------------------------
@ -24,6 +20,7 @@ source ../.pct-helpers
 DFL_ID=${DFL_ID:=101}
 DFL_CTHOSTNAME=${GATE_HOSTNAME:=${DFL_CTHOSTNAME:=gate}}

+CORES=1
 RAM=128
 SWAP=$RAM
 DRIVE=0.5
@ -45,6 +42,7 @@ readVars

 OPTS_STAGE_1="\
 	--hostname $CTHOSTNAME \
+	--cores $CORES \
 	--memory $RAM \
 	--swap $SWAP \
 	--net0 name=wan,bridge=vmbr${WAN_BRIDGE},firewall=1${WAN_GATE:+,gw=${WAN_GATE}}${WAN_IP:+,ip=${WAN_IP}},type=veth \
--- a/nextcloud/assets/etc/network/.pve-ignore.interfaces
+++ b/nextcloud/assets/etc/network/.pve-ignore.interfaces
--- a/nextcloud/assets/etc/network/interfaces
+++ b/nextcloud/assets/etc/network/interfaces
@ -0,0 +1,7 @@
+auto lo
+iface lo inet loopback
+
+auto lan
+iface lan inet dhcp
+	hostname $(hostname)
+
--- a/nextcloud/make.sh
+++ b/nextcloud/make.sh
@ -0,0 +1,102 @@
+#!/usr/bin/bash
+#----------------------------------------------------------------------
+
+cd $(dirname $0)
+PATH=$PATH:$(dirname "$(pwd)")
+
+
+#----------------------------------------------------------------------
+
+source ../.pct-helpers
+
+
+#----------------------------------------------------------------------
+
+readConfig
+
+
+#----------------------------------------------------------------------
+
+DFL_ID=${DFL_ID:=300}
+DFL_CTHOSTNAME=${DFL_CTHOSTNAME:=nextcloud}
+
+DFL_CORES=${DFL_CORES:=2}
+DFL_RAM=${DFL_RAM:=2048}
+DFL_SWAP=${DFL_SWAP:=${DFL_RAM:=2048}}
+DFL_DRIVE=${DFL_DRIVE:=40}
+
+WAN_IP=-
+WAN_GATE=-
+ADMIN_IP=-
+ADMIN_GATE=-
+LAN_IP=-
+LAN_GATE=-
+
+REBOOT=${REBOOT:=1}
+
+readVars
+
+
+#----------------------------------------------------------------------
+
+# XXX  cores...
+OPTS_STAGE_1="\
+	--hostname $CTHOSTNAME \
+	--cores $CORES \
+	--memory $RAM \
+	--swap $SWAP \
+	--net0 name=lan,bridge=vmbr${LAN_BRIDGE},firewall=1,ip=dhcp,type=veth \
+	--storage local-lvm \
+	--rootfs local-lvm:$DRIVE \
+	--unprivileged 1 \
+	${PCT_EXTRA} \
+"
+
+OPTS_STAGE_2="\
+	--startup order=90,up=10 \
+	--onboot 1 \
+"
+
+
+#----------------------------------------------------------------------
+
+echo "# Building config..."
+buildAssets "$TEMPLATE_DIR" "$ASSETS_DIR"
+
+echo "# Creating CT..."
+getLatestTemplate '.*-turnkey-nextcloud' TEMPLATE
+pctCreate $ID "$TEMPLATE" "$OPTS_STAGE_1" "$PASS"
+sleep ${TIMEOUT:=5}
+
+#echo "# Starting TKL Setup (this may take a few minutes to start)..."
+#@ lxc-attach $ID -- bash --login -i
+##@ lxc-attach $ID -- /usr/sbin/trunkey-init
+#
+#echo "# Updating config..."
+## XXX update /var/www/nextcloud/config/config.php
+##	- trusted_domains
+##	- trusted_proxies
+#@ lxc-attach $ID -- \
+#	sed \
+#		-e 's/^\(\s*\)\('\''trusted_domains\)/\1'\''trusted_proxies'\'' =>\n\1array (\n\1\1'${GATE_LAN_IP}'\/32\n\1)\n\1\2/' \
+#		-i /var/www/nextcloud/config/config.php
+
+echo "# Copying assets..."
+@ pct-push-r $ID ./assets /
+
+echo "# Disabling fail2ban..."
+# NOTE: we do not need this as we'll be running from behind a reverse proxy...
+@ lxc-attach $ID systemctl stop fail2ban
+@ lxc-attach $ID systemctl disable fail2ban
+
+echo "# Post config..."
+pctSet $ID "${OPTS_STAGE_2}" $REBOOT
+
+echo "# Done."
+
+
+
+#----------------------------------------------------------------------
+# vim:set ts=4 sw=4 :
+
+
--- a/ns/make.sh
+++ b/ns/make.sh
@ -12,11 +12,7 @@ source ../.pct-helpers

 #----------------------------------------------------------------------

-[ -e ../config.global ] \
-	&& source ../config.global
-
-[ -e ./config ] \
-	&& source ./config
+readConfig


 #----------------------------------------------------------------------
@ -24,6 +20,7 @@ source ../.pct-helpers
 DFL_ID=${DFL_ID:=100}
 DFL_CTHOSTNAME=${NS_HOSTNAME:=${DFL_CTHOSTNAME:=ns}}

+CORES=1
 RAM=128
 SWAP=$RAM
 DRIVE=0.5
@ -45,6 +42,7 @@ readVars

 OPTS_STAGE_1="\
 	--hostname $CTHOSTNAME \
+	--cores $CORES \
 	--memory $RAM \
 	--swap $SWAP \
 	--net0 name=lan,bridge=vmbr${LAN_BRIDGE},firewall=1${LAN_GATE:+,gw=$LAN_GATE}${LAN_IP:+,ip=$LAN_IP},type=veth \
--- a/ssh/make.sh
+++ b/ssh/make.sh
@ -12,11 +12,7 @@ source ../.pct-helpers

 #----------------------------------------------------------------------

-[ -e ../config.global ] \
-	&& source ../config.global
-
-[ -e ./config ] \
-	&& source ./config
+readConfig


 #----------------------------------------------------------------------
@ -24,6 +20,7 @@ source ../.pct-helpers
 DFL_ID=${DFL_ID:=102}
 DFL_CTHOSTNAME=${DFL_CTHOSTNAME:=ssh}

+DFL_CORES=${DFL_CORES:=1}
 DFL_RAM=${DFL_RAM:=1024}
 DFL_SWAP=${DFL_SWAP:=${DFL_RAM:=1024}}
 DFL_DRIVE=${DFL_DRIVE:=16}
@ -45,6 +42,7 @@ readVars

 OPTS_STAGE_1="\
 	--hostname $CTHOSTNAME \
+	--cores $CORES \
 	--memory $RAM \
 	--swap $SWAP \
 	--net0 name=lan,bridge=vmbr${LAN_BRIDGE},firewall=1,ip=dhcp,type=veth \
--- a/syncthing/make.sh
+++ b/syncthing/make.sh
@ -12,11 +12,7 @@ source ../.pct-helpers

 #----------------------------------------------------------------------

-[ -e ../config.global ] \
-	&& source ../config.global
-
-[ -e ./config ] \
-	&& source ./config
+readConfig


 #----------------------------------------------------------------------
@ -24,6 +20,7 @@ source ../.pct-helpers
 DFL_ID=${DFL_ID:=301}
 DFL_CTHOSTNAME=${DFL_CTHOSTNAME:=syncthing}

+DFL_CORES=${DFL_CORES:=1}
 DFL_RAM=${DFL_RAM:=1024}
 DFL_SWAP=${DFL_SWAP:=${DFL_RAM:=1024}}
 DFL_DRIVE=${DFL_DRIVE:=8}
@ -44,6 +41,7 @@ readVars

 OPTS_STAGE_1="\
 	--hostname $CTHOSTNAME \
+	--cores $CORES \
 	--memory $RAM \
 	--swap $SWAP \
 	--net0 name=lan,bridge=vmbr${LAN_BRIDGE},firewall=1,ip=dhcp,type=veth \
Author	SHA1	Message	Date
Alex A. Naanou	90a142ad3c	made the nextcloud setup semi-manual (testing)... Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>	2024-01-07 18:55:50 +03:00
Alex A. Naanou	0fda14bab3	... Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>	2024-01-07 16:42:14 +03:00
Alex A. Naanou	f45338142f	tweaks... Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>	2024-01-07 16:34:47 +03:00
Alex A. Naanou	3c1fd7123c	chmod +x... Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>	2024-01-07 16:19:51 +03:00
Alex A. Naanou	67af4314cd	added nextcloud (testing)... Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>	2024-01-07 16:18:27 +03:00