From 522e949dc3f75ed79b6a9b2e58b68379ff5f35a2 Mon Sep 17 00:00:00 2001 From: montagneid Date: Tue, 12 May 2026 13:36:00 +0200 Subject: [PATCH 1/8] Requested changes by team --- ct/umbraco.sh | 2 -- install/umbraco-install.sh | 22 ++++------------------ 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/ct/umbraco.sh b/ct/umbraco.sh index 3c6eafe8..da49ce75 100644 --- a/ct/umbraco.sh +++ b/ct/umbraco.sh @@ -39,8 +39,6 @@ function update_script() { msg_info "Updating Umbraco Templates" $STD dotnet new update msg_ok "Updated Umbraco Templates" - - msg_ok "Update completed successfully!" exit } diff --git a/install/umbraco-install.sh b/install/umbraco-install.sh index edb12ef5..f30db173 100644 --- a/install/umbraco-install.sh +++ b/install/umbraco-install.sh @@ -16,7 +16,7 @@ update_os var_project_name="cms" msg_info "Installing Dependencies" -$STD apt-get install -y \ +$STD apt install -y \ ca-certificates \ uuid-runtime \ nginx \ @@ -24,12 +24,8 @@ $STD apt-get install -y \ msg_ok "Installed Dependencies" msg_info "Installing .NET SDK 10.0" -$STD wget https://packages.microsoft.com/config/debian/13/packages-microsoft-prod.deb -O packages-microsoft-prod.deb -$STD dpkg -i packages-microsoft-prod.deb -$STD rm packages-microsoft-prod.deb - -$STD apt-get update && \ - $STD apt-get install -y dotnet-sdk-10.0 +setup_deb822 "microsoft" "https://packages.microsoft.com/config/debian/13/packages-microsoft-prod.deb" +$STD apt install -y dotnet-sdk-10.0 msg_ok "Installed .NET SDK 10.0" msg_info "Installing dotnet Umbraco templates and create project (Patience)" @@ -41,7 +37,6 @@ msg_ok "Umbraco templates installed and project created" msg_info "Configuring database connection and unattended setup" cd /var/www/html/$var_project_name UMBRACO_PASS=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c13) - jq --arg umbracopass "$UMBRACO_PASS" '. + { "ConnectionStrings": { "umbracoDbDSN": "Data Source=|DataDirectory|/Umbraco.sqlite.db;Cache=Shared;Foreign Keys=True;Pooling=True", @@ -64,7 +59,6 @@ msg_ok "Database connection and unattended setup configured" msg_info "Setting up Nginx Server" rm -f /var/www/html/index.nginx-debian.html - cat </etc/nginx/sites-available/default map \$http_connection \$connection_upgrade { "~*Upgrade" \$http_connection; @@ -91,11 +85,7 @@ server { } } EOF - -mkdir /etc/nginx/certificate -cd /etc/nginx/certificate -openssl req -new -newkey rsa:4096 -x509 -sha256 -days 365 -nodes -out nginx-certificate.crt -keyout nginx.key -subj "/C=NL/ST=State/L=City/O=Organization/CN=localhost" &>/dev/null - +create_self_signed_certificate "/etc/nginx/certificate" "nginx-certificate.crt" "nginx.key" "localhost" systemctl reload nginx msg_ok "Nginx Server created" @@ -151,12 +141,9 @@ mkdir -p /var/www/html usermod -d /var/www/html ftp usermod -d /var/www/html ftpuser chown -R ftpuser:ftpuser /var/www/html - sed -i "s|#write_enable=YES|write_enable=YES|g" /etc/vsftpd.conf sed -i "s|#chroot_local_user=YES|chroot_local_user=NO|g" /etc/vsftpd.conf - systemctl restart -q vsftpd.service - { echo "FTP Credentials" echo "Username: ftpuser" @@ -169,7 +156,6 @@ PROJECT_GUID=$(uuidgen | tr '[:upper:]' '[:lower:]') CONTAINER_IP=$(hostname -I | awk '{print $1}') PUBLISH_PROFILE_DIR="/var/www/html/${var_project_name}/Properties/PublishProfiles" mkdir -p "$PUBLISH_PROFILE_DIR" - cat >"$PUBLISH_PROFILE_DIR/FTPProfile.pubxml" < From f246bc47fda23f6974600dd0bc59e99c31c3b13e Mon Sep 17 00:00:00 2001 From: montagneid Date: Tue, 12 May 2026 13:44:45 +0200 Subject: [PATCH 2/8] Change to setup_deb822_repo --- install/umbraco-install.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/install/umbraco-install.sh b/install/umbraco-install.sh index f30db173..1dd0062e 100644 --- a/install/umbraco-install.sh +++ b/install/umbraco-install.sh @@ -24,7 +24,13 @@ $STD apt install -y \ msg_ok "Installed Dependencies" msg_info "Installing .NET SDK 10.0" -setup_deb822 "microsoft" "https://packages.microsoft.com/config/debian/13/packages-microsoft-prod.deb" +setup_deb822_repo \ + "microsoft-prod" \ + "https://packages.microsoft.com/keys/microsoft.asc" \ + "https://packages.microsoft.com/debian/13/prod" \ + "bookworm" \ + "main" +$STD apt update $STD apt install -y dotnet-sdk-10.0 msg_ok "Installed .NET SDK 10.0" From 8613c61520f342b8cd5bfbc2e8042d1e526aa0b2 Mon Sep 17 00:00:00 2001 From: montagneid Date: Tue, 12 May 2026 14:01:19 +0200 Subject: [PATCH 3/8] Change setup_deb822_repo --- install/umbraco-install.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/install/umbraco-install.sh b/install/umbraco-install.sh index 1dd0062e..d2b9dd4c 100644 --- a/install/umbraco-install.sh +++ b/install/umbraco-install.sh @@ -25,12 +25,10 @@ msg_ok "Installed Dependencies" msg_info "Installing .NET SDK 10.0" setup_deb822_repo \ - "microsoft-prod" \ - "https://packages.microsoft.com/keys/microsoft.asc" \ - "https://packages.microsoft.com/debian/13/prod" \ - "bookworm" \ - "main" -$STD apt update + "microsoft" \ + "https://packages.microsoft.com/keys/microsoft-2025.asc" \ + "https://packages.microsoft.com/debian/13/prod/" \ + "trixie" $STD apt install -y dotnet-sdk-10.0 msg_ok "Installed .NET SDK 10.0" From e39c6252bcde874dfb7bd4c46f0253917c9eba77 Mon Sep 17 00:00:00 2001 From: montagneid Date: Tue, 12 May 2026 14:11:38 +0200 Subject: [PATCH 4/8] changes create_self_signed_cert --- install/umbraco-install.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/install/umbraco-install.sh b/install/umbraco-install.sh index d2b9dd4c..0d6f4d36 100644 --- a/install/umbraco-install.sh +++ b/install/umbraco-install.sh @@ -89,7 +89,10 @@ server { } } EOF -create_self_signed_certificate "/etc/nginx/certificate" "nginx-certificate.crt" "nginx.key" "localhost" +create_self_signed_cert "Nginxkey" +TLS_DIR="/etc/nginx/certificate" +TLS_CERT="$TLS_DIR/nginx-certificate.crt" +TLS_KEY="$TLS_DIR/nginx.key" systemctl reload nginx msg_ok "Nginx Server created" From bb35204b585b19c7b98656bb371bcf0f81762cf3 Mon Sep 17 00:00:00 2001 From: montagneid Date: Tue, 12 May 2026 14:22:50 +0200 Subject: [PATCH 5/8] Change create_self_signed_cert and ram --- ct/umbraco.sh | 2 +- install/umbraco-install.sh | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/ct/umbraco.sh b/ct/umbraco.sh index da49ce75..0be94224 100644 --- a/ct/umbraco.sh +++ b/ct/umbraco.sh @@ -8,7 +8,7 @@ source <(curl -fsSL https://raw.githubusercontent.com/montagneid/ProxmoxVED/main APP="Umbraco" var_tags="${var_tags:-website}" var_cpu="${var_cpu:-2}" -var_ram="${var_ram:-500}" +var_ram="${var_ram:-512}" var_disk="${var_disk:-8}" var_os="${var_os:-debian}" var_version="${var_version:-13}" diff --git a/install/umbraco-install.sh b/install/umbraco-install.sh index 0d6f4d36..9a6d7fe6 100644 --- a/install/umbraco-install.sh +++ b/install/umbraco-install.sh @@ -71,8 +71,8 @@ map \$http_connection \$connection_upgrade { server { listen 443 ssl default_server; listen [::]:443 ssl default_server; - ssl_certificate /etc/nginx/certificate/nginx-certificate.crt; - ssl_certificate_key /etc/nginx/certificate/nginx.key; + ssl_certificate /etc/ssl/umbraco.crt; + ssl_certificate_key /etc/ssl/umbraco.key; location / { proxy_pass https://127.0.0.1:7000/; proxy_http_version 1.1; @@ -89,10 +89,7 @@ server { } } EOF -create_self_signed_cert "Nginxkey" -TLS_DIR="/etc/nginx/certificate" -TLS_CERT="$TLS_DIR/nginx-certificate.crt" -TLS_KEY="$TLS_DIR/nginx.key" +create_self_signed_cert systemctl reload nginx msg_ok "Nginx Server created" From a3cc5bfad1f4bb8b69be7948e3ab5c4d27a3b9eb Mon Sep 17 00:00:00 2001 From: montagneid Date: Tue, 12 May 2026 14:34:06 +0200 Subject: [PATCH 6/8] test create_self_signed_cert --- install/umbraco-install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install/umbraco-install.sh b/install/umbraco-install.sh index 9a6d7fe6..82d60cac 100644 --- a/install/umbraco-install.sh +++ b/install/umbraco-install.sh @@ -71,8 +71,8 @@ map \$http_connection \$connection_upgrade { server { listen 443 ssl default_server; listen [::]:443 ssl default_server; - ssl_certificate /etc/ssl/umbraco.crt; - ssl_certificate_key /etc/ssl/umbraco.key; + ssl_certificate /etc/ssl/umbraco/umbraco.crt; + ssl_certificate_key /etc/ssl/umbraco/umbraco.key; location / { proxy_pass https://127.0.0.1:7000/; proxy_http_version 1.1; @@ -90,7 +90,7 @@ server { } EOF create_self_signed_cert -systemctl reload nginx +#systemctl reload nginx msg_ok "Nginx Server created" msg_info "Creating Kestrel Umbraco Service" From 05c44288b00ecd5dd79ae98cd2be19f4e7b474de Mon Sep 17 00:00:00 2001 From: montagneid Date: Tue, 12 May 2026 14:41:18 +0200 Subject: [PATCH 7/8] enable systemctl nginx --- install/umbraco-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/umbraco-install.sh b/install/umbraco-install.sh index 82d60cac..d77e8564 100644 --- a/install/umbraco-install.sh +++ b/install/umbraco-install.sh @@ -90,7 +90,7 @@ server { } EOF create_self_signed_cert -#systemctl reload nginx +systemctl reload nginx msg_ok "Nginx Server created" msg_info "Creating Kestrel Umbraco Service" From 2ea2d52ef8422a46a3e9e623c29528cea0c3ab04 Mon Sep 17 00:00:00 2001 From: montagneid Date: Tue, 12 May 2026 14:55:43 +0200 Subject: [PATCH 8/8] Remove .net install --- ct/umbraco.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ct/umbraco.sh b/ct/umbraco.sh index 0be94224..bbd9b8aa 100644 --- a/ct/umbraco.sh +++ b/ct/umbraco.sh @@ -32,10 +32,6 @@ function update_script() { $STD apt -y upgrade msg_ok "Updated ${APP} LXC" - msg_info "Updating .NET SDK" - $STD apt install -y dotnet-sdk-10.0 - msg_ok "Updated .NET SDK" - msg_info "Updating Umbraco Templates" $STD dotnet new update msg_ok "Updated Umbraco Templates"