diff --git a/ct/umbraco.sh b/ct/umbraco.sh index 3c6eafe8..bbd9b8aa 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}" @@ -32,15 +32,9 @@ 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" - - msg_ok "Update completed successfully!" exit } diff --git a/install/umbraco-install.sh b/install/umbraco-install.sh index edb12ef5..d77e8564 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,12 @@ $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_repo \ + "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" msg_info "Installing dotnet Umbraco templates and create project (Patience)" @@ -41,7 +41,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 +63,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; @@ -73,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/umbraco.crt; + ssl_certificate_key /etc/ssl/umbraco/umbraco.key; location / { proxy_pass https://127.0.0.1:7000/; proxy_http_version 1.1; @@ -91,11 +89,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_cert systemctl reload nginx msg_ok "Nginx Server created" @@ -151,12 +145,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 +160,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" <