cleaned up repo

we don't need this file any more as it's generated by bash script

.env

@@ -1,8 +0,0 @@
-NETWORKNAME=
-MYSQL_ROOT_PASSWORD=
-MYSQL_USER=
-MYSQL_PASSWORD=
-MYSQL_DATABASE=
-MYSQL_USER=
-MYSQL_PASSWORD=
-MYSQL_DATABASE=

bin/generate_env.sh

@@ -0,0 +1,50 @@
+#!/bin/bash
+
+ENV_FILE=".env"
+
+# Function to generate a random alphanumeric password of a given length
+generate_password() {
+  tr -dc 'a-zA-Z0-9' < /dev/urandom | head -c "${1:-12}"
+}
+
+# Function to prompt for a value if not set as a parameter
+prompt_for_value() {
+  read -p "$1: " value
+  echo "$value"
+}
+
+# Set $PROJECTNAME if not provided as a parameter
+PROJECTNAME=${1:-$(prompt_for_value "Enter PROJECTNAME")}
+
+cat <<EOF > $ENV_FILE
+# Docker
+NETWORKNAME=admin_web
+
+# MySQL
+MYSQL_ROOT_PASSWORD=$(generate_password)
+MYSQL_USER=u_$(echo $PROJECTNAME | tr '[:upper:]' '[:lower:]')
+MYSQL_PASSWORD=$(generate_password)
+MYSQL_DATABASE=db_$(echo $PROJECTNAME | tr '[:upper:]' '[:lower:]')
+
+# GITEA
+GITEA_API_URL=REPLACEME
+ACCESS_TOKEN=REPLACEME
+
+# Joomla
+EMAIL=noreply@$(echo $PROJECTNAME | tr '[:upper:]' '[:lower:]').com
+JOOMLA_USER="$PROJECTNAME"
+JOOMLA_USERNAME=admin
+# Passwords must be 12 characters long (admin-password)
+JOOMLA_PASSWORD=$(generate_password)
+
+# SMTP
+SMTP_USER=null
+SMTP_PASS=null
+SMTP_HOST='mailhog'
+SMTP_SECURITY='None'
+SMTP_PORT=1025
+EOF
+
+rm $0
+
+echo "Generated $ENV_FILE with randomly generated passwords and customized PROJECTNAME."

bin/inc_new_project/git_setup.sh

@@ -1,14 +1,15 @@
 #!/bin/bash
+# This Bash script initializes a new Git repository, removes existing Git info, creates a README.md with the project name, and makes an initial commit.
 
 PROJECTNAME=$(basename "$(pwd)")
 
-# Remove existing Git repository information
+rm -rf .git # Remove existing Git repository information
-rm -rf .git
 
+# New readme for Project
 rm README.md 
 touch README.md
 echo "# ${PROJECTNAME}" > README.md
-echo "" > README.md
+echo "" >> README.md
 echo "Created a fresh repo for your ${PROJECTNAME}  project." >> README.md
 
 # Initialize a new Git repository

bin/inc_new_project/remote_git_setup.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# Creates a private Git repository on Gitea using its API, adds a remote origin to the local Git repository, and pushes existing changes to the master branch.
 
 PROJECTNAME=$(basename "$(pwd)")
 

bin/install_extensions.sh

@@ -6,19 +6,21 @@ if [ "$EUID" -ne 0 ]; then
     exit 1
 fi
 
-# Template
+echo "Astroid Framework (Template)"
 # [GitHub](https://github.com/templaza/astroid-framework)
-docker-compose exec -u www-data joomla php cli/joomla.php extension:install --url=https://github.com/templaza/astroid-framework/releases/download/v2.6.5/astroid-package-v2.6.5.Framework-Template.zip
+docker-compose exec -u www-data joomla php cli/joomla.php extension:install --url=https://github.com/templaza/astroid-framework/releases/download/v3.0.7/astroid-framework-3.0.7.zip
 
-# Sitemap
+echo "OSMap (Sitemap)"
 # [GitHub](https://github.com/joomlashack/OSMap)
-docker-compose exec -u www-data joomla php cli/joomla.php extension:install --url=https://deploy.ostraining.com/client/download/free/latest-stable/com_osmap
+docker-compose exec -u www-data joomla php cli/joomla.php extension:install --url=https://github.com/joomlashack/OSMap/releases/download/v5.0.15/com_osmap_free_5.0.15.zip
 
-# Comments
+echo "Akeeba Engage (Comments)"
 # [Download page](https://www.akeeba.com/download/engage/3-2-5.html)
 # [Github](https://github.com/akeeba/engage)
-docker-compose exec -u www-data joomla php cli/joomla.php extension:install --url=https://www.akeeba.com/download/engage/3-2-5/pkg-engage-3-2-5-zip.zip
+docker-compose exec -u www-data joomla php cli/joomla.php extension:install --url=https://www.akeeba.com/download/engage/3-3-3/pkg-engage-3-3-3-zip.zip
 
-# Contact Form
+echo "Mavro Contact Form"
 # [GitHub](https://github.com/mavrosxristoforos/rapid-contact)
-docker-compose exec -u www-data joomla php cli/joomla.php extension:install --url=https://github.com/mavrosxristoforos/rapid-contact/releases/download/1.4.27/mod_rapid_contact.zip
+docker-compose exec -u www-data joomla php cli/joomla.php extension:install --url=https://github.com/mavrosxristoforos/rapid-contact/releases/download/1.4.37/mod_rapid_contact.zip
+
+echo "END installing extensions"

bin/joomla_cleanup.sh

@@ -84,5 +84,8 @@ rm -f html/README.txt
 rm -rf bin/inc_new_project
 rm -rf bin/joomla_new_project.sh
 rm -rf bin/joomla_install.sh
+rm -rf bin/install_extensions.sh
+
+rm $0
 
 echo "Now check the results and commit them to Git"

bin/joomla_install.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# Runs the joomla cli through docker
 
 PROJECTNAME=$(basename "$(pwd)")
 

bin/password-generate-for-env.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-
-# Function to generate a random password using passgen
-generate_password() {
-    pwgen -cnsB1v 12
-}
-
-# Get the name of the current directory (project name)
-PROJECT_NAME=$(basename "$(pwd)")
-MYSQL_USER="${PROJECT_NAME}_joomla_user"
-MYSQL_DATABASE="${PROJECT_NAME}_joomla_db"
-
-echo "Generated passwords:"
-
-# Generate passwords for specific variables and print them to CLI
-echo "MYSQL_ROOT_PASSWORD=$(generate_password)"
-echo "MYSQL_USER=$MYSQL_USER"
-echo "MYSQL_DATABASE=$MYSQL_DATABASE"
-echo "MYSQL_PASSWORD=$(generate_password)"
-echo "MYSQL_DATABASE=$MYSQL_DATABASE"
-echo "JOOMLA_PASSWORD=$(generate_password)"

development/README.md

@@ -1,5 +0,0 @@
-# Development Directory
-
-The development directory in this repository is specifically intended for use within the staging environment of Joomla installations. 
-It serves as a mount point within the Joomla installation app for easy extension installation.
-

docker-compose.staging.yml

@@ -4,7 +4,7 @@ services:
 
   joomla:
     volumes:
-      - ./development:/development
+      - ./data/development:/development
     ports:
       - "8000:80"
 

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.8'
 
 # For Staging
-# docker-compose -f docker-compose.yml -f docker-compose.staging.yml --env-file .env.staging up -d
+# docker-compose -f docker-compose.yml -f docker-compose.staging.yml up -d
 #
 # For Production
 # docker-compose up -d

env.sample.txt

@@ -1,26 +0,0 @@
-# Docker
-NETWORKNAME=admin_web
-
-# MySQL
-MYSQL_ROOT_PASSWORD=REPLACEME
-MYSQL_USER=REPLACEME
-MYSQL_PASSWORD=REPLACEME
-MYSQL_DATABASE=REPLACEME
-
-# GITEA
-GITEA_API_URL=REPLACEME
-ACCESS_TOKEN=REPLACEME
-
-# Joomla
-EMAIL=noreply@example.com
-JOOMLA_USER="John Doe"
-JOOMLA_USERNAME=admin
-# Passwords must be 12 characters long (admin-password)
-JOOMLA_PASSWORD=REPLACEME123
-
-# SMTP
-SMTP_USER=null
-SMTP_PASS=null
-SMTP_HOST='mailhog'
-SMTP_SECURITY='None'
-SMTP_PORT=1025

html/index.html

@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Placeholder</title>
-</head>
-<body>
-  <h1>Placeholder</h1>
-</body>
-</html>