Clean up comments and source fallback in fleet.sh

Removed local core checkout comments and fallback source.

ct/fleet.sh

@@ -0,0 +1,63 @@
+#!/usr/bin/env bash
+source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/build.func)
+# Copyright (c) 2021-2026 community-scripts ORG
+# Author: MickLesk (CanbiZ)
+# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
+# Source: https://github.com/fleetdm/fleet
+
+APP="Fleet"
+var_tags="${var_tags:-monitoring;device-management;security}"
+var_cpu="${var_cpu:-2}"
+var_ram="${var_ram:-2048}"
+var_disk="${var_disk:-8}"
+var_os="${var_os:-ubuntu}"
+var_version="${var_version:-24.04}"
+#var_arm64="${var_arm64:-no}" # unset = ask the user; set yes/no only when verified
+var_unprivileged="${var_unprivileged:-1}"
+
+header_info "$APP"
+variables
+color
+catch_errors
+
+function update_script() {
+  header_info
+  check_container_storage
+  check_container_resources
+
+  if [[ ! -f /opt/fleet/fleet ]]; then
+    msg_error "No ${APP} Installation Found!"
+    exit
+  fi
+
+  if check_for_gh_release "fleet" "fleetdm/fleet"; then
+    msg_info "Stopping Service"
+    systemctl stop fleet
+    msg_ok "Stopped Service"
+
+    fetch_and_deploy_gh_release "fleet" "fleetdm/fleet" "prebuild" "latest" "/opt/fleet" "fleet_v*_linux.tar.gz"
+    chmod +x /opt/fleet/fleet
+
+    msg_info "Running Database Migrations"
+    set -a && source /opt/fleet/.env && set +a
+    $STD /opt/fleet/fleet prepare db --no-prompt
+    msg_ok "Ran Database Migrations"
+
+    msg_info "Starting Service"
+    systemctl start fleet
+    msg_ok "Started Service"
+    msg_ok "Updated successfully!"
+  fi
+  exit
+}
+
+start
+build_container
+description
+
+msg_ok "Completed Successfully!\n"
+echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
+echo -e "${INFO}${YW}Access it using the following URL:${CL}"
+echo -e "${GATEWAY}${BGN}http://${IP}:8080${CL}"
+echo -e "${INFO}${YW} Admin Email:${CL} ${BGN}admin@fleet.local${CL}"
+echo -e "${INFO}${YW} Admin Password:${CL} ${BGN}Check inside the container: cat /opt/fleet/.env${CL}"

ct/headers/fleet

@@ -0,0 +1,6 @@
+    ________          __ 
+   / ____/ /__  ___  / /_
+  / /_  / / _ \/ _ \/ __/
+ / __/ / /  __/  __/ /_  
+/_/   /_/\___/\___/\__/  
+                         

ct/projectsend.sh

@@ -28,37 +28,27 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-
-  if [[ -f /opt/projectsend/includes/sys.config.php ]]; then
-    msg_error "This container runs ProjectSend Legacy (pre-2.0)."
-    msg_error "2.0 is a new application, not an update - there is no in-place upgrade."
-    msg_error "Set up a fresh ProjectSend container and use projectsend/v1-migration-tool to bring your data across."
-    exit
-  fi
+  setup_mariadb
 
   if check_for_gh_release "projectsend" "projectsend/projectsend"; then
-    msg_info "Stopping Services"
-    systemctl stop nginx projectsend-worker
-    msg_ok "Stopped Services"
+    msg_info "Stopping Service"
+    systemctl stop apache2
+    msg_ok "Stopped Service"
 
-    create_backup /opt/projectsend/.env /opt/projectsend/storage/app/files
+    php_ver=$(php -v | head -n 1 | awk '{print $2}')
+    if [[ ! $php_ver == "8.4"* ]]; then
+      PHP_VERSION="8.4" PHP_APACHE="YES" setup_php
+    fi
 
-    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "projectsend" "projectsend/projectsend" "prebuild" "latest" "/opt/projectsend"
-
-    restore_backup
-
-    msg_info "Updating ProjectSend"
-    cd /opt/projectsend
+    mv /opt/projectsend/includes/sys.config.php /opt/sys.config.php
+    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "projectsend" "projectsend/projectsend" "prebuild" "latest" "/opt/projectsend" "projectsend-r*.zip"
+    mv /opt/sys.config.php /opt/projectsend/includes/sys.config.php
     chown -R www-data:www-data /opt/projectsend
-    chmod -R 775 /opt/projectsend/storage /opt/projectsend/bootstrap/cache
-    $STD sudo -u www-data php artisan migrate --force
-    $STD sudo -u www-data php artisan projectsend:ensure-roles
-    $STD sudo -u www-data php artisan optimize:clear
-    msg_ok "Updated ProjectSend"
+    chmod -R 775 /opt/projectsend
 
-    msg_info "Starting Services"
-    systemctl start nginx projectsend-worker
-    msg_ok "Started Services"
+    msg_info "Starting Service"
+    systemctl start apache2
+    msg_ok "Started Service"
     msg_ok "Updated successfully!"
   fi
   exit
@@ -71,5 +61,4 @@ description
 msg_ok "Completed successfully!\n"
 echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
 echo -e "${INFO}${YW}Access it using the following URL:${CL}"
-echo -e "${GATEWAY}${BGN}http://${IP}${CL}"
-echo -e "${INFO}${YW}Admin credentials saved to ~/projectsend.creds${CL}"
+echo -e "${GATEWAY}${BGN}http://${IP}/install for the initial setup${CL}"

install/fleet-install.sh

@@ -0,0 +1,93 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2026 community-scripts ORG
+# Author: MickLesk (CanbiZ)
+# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
+# Source: https://github.com/fleetdm/fleet
+
+source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
+color
+verb_ip6
+catch_errors
+setting_up_container
+network_check
+update_os
+
+msg_info "Installing Dependencies"
+$STD apt install -y redis-server mysql-server
+msg_ok "Installed Dependencies"
+
+MYSQL_DB_NAME="fleet" MYSQL_DB_USER="fleet" setup_mysql_db
+fetch_and_deploy_gh_release "fleet" "fleetdm/fleet" "prebuild" "latest" "/opt/fleet" "fleet_v*_linux.tar.gz"
+
+msg_info "Configuring Application"
+chmod +x /opt/fleet/fleet
+PRIVATE_KEY=$(openssl rand -hex 32)
+cat <<EOF >/opt/fleet/.env
+FLEET_MYSQL_ADDRESS=127.0.0.1:3306
+FLEET_MYSQL_DATABASE=fleet
+FLEET_MYSQL_USERNAME=fleet
+FLEET_MYSQL_PASSWORD=${MYSQL_DB_PASS}
+FLEET_SERVER_ADDRESS=0.0.0.0:8080
+FLEET_SERVER_TLS=false
+FLEET_SERVER_PRIVATE_KEY=${PRIVATE_KEY}
+FLEET_REDIS_ADDRESS=127.0.0.1:6379
+FLEET_LOGGING_JSON=true
+EOF
+msg_ok "Configured Application"
+
+msg_info "Running Database Migrations"
+set -a && source /opt/fleet/.env && set +a
+$STD /opt/fleet/fleet prepare db --no-prompt
+msg_ok "Ran Database Migrations"
+
+msg_info "Creating Service"
+cat <<EOF >/etc/systemd/system/fleet.service
+[Unit]
+Description=Fleet
+After=network.target mysql.service redis-server.service
+Requires=mysql.service redis-server.service
+
+[Service]
+Type=simple
+User=root
+WorkingDirectory=/opt/fleet
+EnvironmentFile=/opt/fleet/.env
+ExecStart=/opt/fleet/fleet serve
+Restart=on-failure
+RestartSec=5
+
+[Install]
+WantedBy=multi-user.target
+EOF
+systemctl enable -q --now fleet redis-server
+msg_ok "Created Service"
+
+msg_info "Initializing Fleet"
+FLEET_ADMIN_EMAIL="admin@fleet.local"
+FLEET_ADMIN_PASS="$(openssl rand -hex 8)1!"
+ELAPSED=0
+until curl -sf "http://127.0.0.1:8080/healthz" >/dev/null 2>&1; do
+  sleep 2
+  ELAPSED=$((ELAPSED + 2))
+  [[ $ELAPSED -ge 60 ]] && break
+done
+SETUP_RESPONSE=$(curl -s -X POST "http://127.0.0.1:8080/api/v1/setup" \
+  -H "Content-Type: application/json" \
+  -d "{\"admin\":{\"admin\":true,\"email\":\"${FLEET_ADMIN_EMAIL}\",\"name\":\"Admin\",\"password\":\"${FLEET_ADMIN_PASS}\"},\"org_info\":{\"org_name\":\"Fleet\",\"org_logo_url\":\"\"},\"server_url\":\"http://127.0.0.1:8080\"}")
+FLEET_TOKEN=$(echo "${SETUP_RESPONSE}" | grep -o '"token":"[^"]*"' | cut -d'"' -f4) || true
+if [[ -n "${FLEET_TOKEN}" ]]; then
+  curl -s -X PATCH "http://127.0.0.1:8080/api/latest/fleet/config" \
+    -H "Content-Type: application/json" \
+    -H "Authorization: Bearer ${FLEET_TOKEN}" \
+    -d "{\"server_settings\":{\"server_url\":\"http://${LOCAL_IP}:8080\"}}" >/dev/null
+fi
+cat <<EOF >>/opt/fleet/.env
+FLEET_ADMIN_EMAIL=${FLEET_ADMIN_EMAIL}
+FLEET_ADMIN_PASSWORD=${FLEET_ADMIN_PASS}
+EOF
+msg_ok "Initialized Fleet"
+
+motd_ssh
+customize
+cleanup_lxc

install/projectsend-install.sh

@@ -13,106 +13,46 @@ setting_up_container
 network_check
 update_os
 
-msg_info "Installing Dependencies"
-$STD apt install -y nginx
-msg_ok "Installed Dependencies"
-
-PHP_VERSION="8.4" PHP_FPM="YES" PHP_MODULE="ldap,pcntl" setup_php
+PHP_VERSION="8.4" PHP_APACHE="YES" setup_php
 setup_mariadb
-MARIADB_DB_NAME="projectsend"
-MARIADB_DB_USER="projectsend"
-setup_mariadb_db
-fetch_and_deploy_gh_release "projectsend" "projectsend/projectsend" "prebuild" "latest" "/opt/projectsend" "projectsend-*.zip"
+MARIADB_DB_NAME="projectsend" MARIADB_DB_USER="projectsend" setup_mariadb_db
+fetch_and_deploy_gh_release "projectsend" "projectsend/projectsend" "prebuild" "latest" "/opt/projectsend" "projectsend-r*.zip"
 
-msg_info "Configuring ProjectSend"
-cd /opt/projectsend
-cp .env.example .env
-ADMIN_EMAIL="admin@example.com"
-ADMIN_PASSWORD=$(openssl rand -base64 18 | tr -dc 'a-zA-Z0-9' | head -c13)
-sed -i \
-  -e "s|^APP_ENV=.*|APP_ENV=production|" \
-  -e "s|^APP_DEBUG=.*|APP_DEBUG=false|" \
-  -e "s|^APP_URL=.*|APP_URL=http://${LOCAL_IP}|" \
-  -e "s|^DB_HOST=.*|DB_HOST=localhost|" \
-  -e "s|^DB_DATABASE=.*|DB_DATABASE=${MARIADB_DB_NAME}|" \
-  -e "s|^DB_USERNAME=.*|DB_USERNAME=${MARIADB_DB_USER}|" \
-  -e "s|^DB_PASSWORD=.*|DB_PASSWORD=${MARIADB_DB_PASS}|" \
-  -e "s|^SESSION_DRIVER=.*|SESSION_DRIVER=database|" \
-  -e "s|^CACHE_STORE=.*|CACHE_STORE=database|" \
-  -e "s|^QUEUE_CONNECTION=.*|QUEUE_CONNECTION=database|" \
-  .env
+msg_info "Installing ProjectSend"
+mv /opt/projectsend/includes/sys.config.sample.php /opt/projectsend/includes/sys.config.php
 chown -R www-data:www-data /opt/projectsend
-chmod -R 775 /opt/projectsend/storage /opt/projectsend/bootstrap/cache
-$STD sudo -u www-data php artisan key:generate --force --no-interaction
-$STD sudo -u www-data php artisan migrate --force
-$STD sudo -u www-data php artisan storage:link --force
-$STD sudo -u www-data php artisan projectsend:ensure-roles
-$STD sudo -u www-data php artisan projectsend:admin --if-none \
-  --name="Administrator" \
-  --email="${ADMIN_EMAIL}" \
-  --password="${ADMIN_PASSWORD}"
-cat <<EOF >~/projectsend.creds
-ProjectSend Credentials
-Admin Email: ${ADMIN_EMAIL}
-Admin Password: ${ADMIN_PASSWORD}
-EOF
-msg_ok "Configured ProjectSend"
+chmod -R 775 /opt/projectsend
+chmod 644 /opt/projectsend/includes/sys.config.php
+sed -i -e "s/\(define('DB_NAME', \).*/\1'$MARIADB_DB_NAME');/" \
+  -e "s/\(define('DB_USER', \).*/\1'$MARIADB_DB_USER');/" \
+  -e "s/\(define('DB_PASSWORD', \).*/\1'$MARIADB_DB_PASS');/" \
+  /opt/projectsend/includes/sys.config.php
+sed -i -e "s/^\(memory_limit = \).*/\1 256M/" \
+  -e "s/^\(post_max_size = \).*/\1 256M/" \
+  -e "s/^\(upload_max_filesize = \).*/\1 256M/" \
+  -e "s/^\(max_execution_time = \).*/\1 300/" \
+  /etc/php/8.4/apache2/php.ini
+msg_ok "Installed projectsend"
 
 msg_info "Creating Service"
-PHP_SOCK=$(get_php_fpm_socket)
-cat <<EOF >/etc/nginx/sites-available/projectsend.conf
-server {
-    listen 80 default_server;
-    server_name _;
-    root /opt/projectsend/public;
-    index index.php;
+cat <<EOF >/etc/apache2/sites-available/projectsend.conf
+<VirtualHost *:80>
+    ServerName projectsend
+    DocumentRoot /opt/projectsend
+    <Directory /opt/projectsend>
+        Options FollowSymLinks
+        AllowOverride All
+        Require all granted
+    </Directory>
 
-    client_max_body_size 100m;
-
-    location / {
-        try_files \$uri \$uri/ /index.php?\$query_string;
-    }
-
-    location /protected-files/ {
-        internal;
-        alias /opt/projectsend/storage/app/files/;
-    }
-
-    location ~ \.php\$ {
-        try_files \$uri =404;
-        fastcgi_pass unix:${PHP_SOCK};
-        fastcgi_index index.php;
-        fastcgi_param SCRIPT_FILENAME \$realpath_root\$fastcgi_script_name;
-        include fastcgi_params;
-        fastcgi_buffer_size 32k;
-        fastcgi_buffers 8 32k;
-    }
-
-    location ~ /\.(?!well-known) {
-        deny all;
-    }
-}
+    ErrorLog /var/log/apache2/projectsend_error.log
+    CustomLog /var/log/apache2/projectsend_access.log combined
+</VirtualHost>
 EOF
-nginx_enable_site projectsend.conf
-
-cat <<EOF >/etc/systemd/system/projectsend-worker.service
-[Unit]
-Description=ProjectSend queue worker
-After=network.target mariadb.service
-
-[Service]
-User=www-data
-Group=www-data
-Restart=always
-WorkingDirectory=/opt/projectsend
-ExecStart=/usr/bin/php artisan queue:work --tries=3 --backoff=3
-
-[Install]
-WantedBy=multi-user.target
-EOF
-systemctl enable -q --now projectsend-worker
-
-echo "* * * * * cd /opt/projectsend && php artisan schedule:run >> /dev/null 2>&1" | crontab -u www-data -
+$STD a2ensite projectsend
+$STD a2enmod rewrite
+$STD a2dissite 000-default.conf
+$STD systemctl reload apache2
 msg_ok "Created Service"
 
 motd_ssh