Merge main and resolve conflicts in documentation templates

docs/contribution/HELPER_FUNCTIONS.md

@@ -440,12 +440,12 @@ create_self_signed_cert
 
 ## Utility Functions
 
-### `import_local_ip`
+### `get_lxc_ip`
 
 Set the `$LOCAL_IP` variable with the container's IP address.
 
 ```bash
-import_local_ip
+get_lxc_ip
 echo "Container IP: $LOCAL_IP"
 
 # Use in config files
@@ -534,7 +534,7 @@ msg_ok "Installed Dependencies"
 NODE_VERSION="22" setup_nodejs
 PG_VERSION="16" setup_postgresql
 PG_DB_NAME="myapp" PG_DB_USER="myapp" setup_postgresql_db
-import_local_ip
+get_lxc_ip
 
 # Download app using fetch_and_deploy (handles version tracking)
 fetch_and_deploy_gh_release "myapp" "example/myapp" "tarball" "latest" "/opt/myapp"
@@ -670,7 +670,7 @@ PHP_VERSION="8.4" PHP_FPM="YES" PHP_MODULE="bcmath,curl,gd,intl,mbstring,mysql,x
 setup_composer
 setup_mariadb
 MARIADB_DB_NAME="myapp" MARIADB_DB_USER="myapp" setup_mariadb_db
-import_local_ip
+get_lxc_ip
 
 # Download pre-built release (with asset pattern)
 fetch_and_deploy_gh_release "myapp" "example/myapp" "prebuild" "latest" "/opt/myapp" "myapp-*.tar.gz"

docs/contribution/templates_install/AppName-install.sh

@@ -57,8 +57,97 @@ msg_ok "Installed Dependencies"
 
 fetch_and_deploy_gh_release "[appname]" "owner/repo" "tarball" "latest" "/opt/[appname]"
 
+# --- Tools & Utilities ---
+# get_lxc_ip                          # Sets $LOCAL_IP variable (call early!)
+# setup_ffmpeg                             # Install FFmpeg with codecs
+# setup_hwaccel                            # Setup GPU hardware acceleration
+# setup_imagemagick                        # Install ImageMagick 7
+# setup_docker                             # Install Docker Engine
+# setup_adminer                            # Install Adminer for DB management
+# create_self_signed_cert                  # Creates cert in /etc/ssl/[appname]/
+
 # =============================================================================
-# CONFIGURE APPLICATION
+# EXAMPLES
+# =============================================================================
+#
+# EXAMPLE 1: Node.js Application with PostgreSQL
+# ---------------------------------------------
+# NODE_VERSION="22" setup_nodejs
+# PG_VERSION="17" setup_postgresql
+# PG_DB_NAME="myapp" PG_DB_USER="myapp" setup_postgresql_db
+# get_lxc_ip
+# fetch_and_deploy_gh_release "myapp" "owner/myapp" "tarball" "latest" "/opt/myapp"
+#
+# msg_info "Configuring MyApp"
+# cd /opt/myapp
+# $STD npm ci
+# cat <<EOF >/opt/myapp/.env
+# DATABASE_URL=postgresql://${PG_DB_USER}:${PG_DB_PASS}@localhost/${PG_DB_NAME}
+# HOST=${LOCAL_IP}
+# PORT=3000
+# EOF
+# msg_ok "Configured MyApp"
+#
+# EXAMPLE 2: Python Application with uv
+# ------------------------------------
+# PYTHON_VERSION="3.13" setup_uv
+# get_lxc_ip
+# fetch_and_deploy_gh_release "myapp" "owner/myapp" "tarball" "latest" "/opt/myapp"
+#
+# msg_info "Setting up MyApp"
+# cd /opt/myapp
+# $STD uv sync
+# cat <<EOF >/opt/myapp/.env
+# HOST=${LOCAL_IP}
+# PORT=8000
+# EOF
+# msg_ok "Setup MyApp"
+
+# =============================================================================
+# EXAMPLE 3: PHP Application with MariaDB + Nginx
+# =============================================================================
+# PHP_VERSION="8.4" PHP_FPM="YES" PHP_MODULE="bcmath,curl,gd,intl,mbstring,mysql,xml,zip" setup_php
+# setup_composer
+# setup_mariadb
+# MARIADB_DB_NAME="myapp" MARIADB_DB_USER="myapp" setup_mariadb_db
+# get_lxc_ip
+# fetch_and_deploy_gh_release "myapp" "owner/myapp" "prebuild" "latest" "/opt/myapp" "myapp-*.tar.gz"
+#
+# msg_info "Configuring MyApp"
+# cd /opt/myapp
+# cp .env.example .env
+# sed -i "s|APP_URL=.*|APP_URL=http://${LOCAL_IP}|" .env
+# sed -i "s|DB_DATABASE=.*|DB_DATABASE=${MARIADB_DB_NAME}|" .env
+# sed -i "s|DB_USERNAME=.*|DB_USERNAME=${MARIADB_DB_USER}|" .env
+# sed -i "s|DB_PASSWORD=.*|DB_PASSWORD=${MARIADB_DB_PASS}|" .env
+# $STD composer install --no-dev --no-interaction
+# chown -R www-data:www-data /opt/myapp
+# msg_ok "Configured MyApp"
+
+# =============================================================================
+# YOUR APPLICATION INSTALLATION
+# =============================================================================
+# 1. Setup runtimes and databases FIRST
+# 2. Call get_lxc_ip if you need the container IP
+# 3. Use fetch_and_deploy_gh_release to download the app (handles version tracking)
+# 4. Configure the application
+# 5. Create systemd service
+# 6. Finalize with motd_ssh, customize, cleanup_lxc
+
+# --- Setup runtimes/databases ---
+NODE_VERSION="22" setup_nodejs
+get_lxc_ip
+
+# --- Download and install app ---
+fetch_and_deploy_gh_release "[appname]" "[owner/repo]" "tarball" "latest" "/opt/[appname]"
+
+msg_info "Setting up [AppName]"
+cd /opt/[appname]
+# $STD npm ci
+msg_ok "Setup [AppName]"
+
+# =============================================================================
+# CONFIGURATION
 # =============================================================================
 
 msg_info "Configuring [AppName]"