further fixes

install.sh

@@ -92,33 +92,11 @@ source packages.conf
 echo "Installing servers..."
 install_packages "${SERVERS[@]}"
 
+echo "Installing utilities..."
+install_packages "${UTILITIES[@]}"
+
 cd ~/.local/share/HamPackServer
 
-if ! pacman -Qi apache &> /dev/null; then
-  echo "Installing Apache..."
-  sudo pacman -S --noconfirm apache
-  sudo systemctl enable httpd
-  sudo systemctl start httpd
-else
-  echo "Apache is already installed, skipping."
-fi
-
-if ! pacman -Qi mariadb &> /dev/null; then
-  echo "Installing MariaDB (MySQL)..."
-  sudo pacman -S --noconfirm mariadb
-  sudo mariadb-install-db --user=mysql --basedir=/usr --datadir=/var/lib/mysql
-  sudo systemctl enable mariadb
-  sudo systemctl start mariadb
-else
-  echo "MariaDB is already installed, skipping."
-fi
-
-if ! pacman -Qi php &> /dev/null; then
-  sudo pacman -S --noconfirm php
-else
-  echo "PHP is already installed, skipping."
-fi
-
 echo "Enabling PHP extensions in /etc/php/php.ini..."
 for ext in curl mbstring xml pdo_mysql mysqli; do
   sudo sed -i "s/^;extension=${ext}$/extension=${ext}/" /etc/php/php.ini
@@ -141,10 +119,10 @@ if [ ! -d "$CLOUDLOG_DIR" ]; then
   # Create MariaDB database and user
   echo "Creating Cloudlog database..."
   sudo mysql -u root <<EOF
-CREATE DATABASE IF NOT EXISTS ${CLOUDLOG_DB};
-CREATE USER IF NOT EXISTS '${CLOUDLOG_DB_USER}'@'localhost' IDENTIFIED BY '${CLOUDLOG_DB_PASS}';
-GRANT ALL PRIVILEGES ON ${CLOUDLOG_DB}.* TO '${CLOUDLOG_DB_USER}'@'localhost';
-FLUSH PRIVILEGES;
+  CREATE DATABASE IF NOT EXISTS ${CLOUDLOG_DB};
+  CREATE USER IF NOT EXISTS '${CLOUDLOG_DB_USER}'@'localhost' IDENTIFIED BY '${CLOUDLOG_DB_PASS}';
+  GRANT ALL PRIVILEGES ON ${CLOUDLOG_DB}.* TO '${CLOUDLOG_DB_USER}'@'localhost';
+  FLUSH PRIVILEGES;
 EOF
 
   sudo systemctl restart httpd

packages.conf

@@ -1,11 +1,14 @@
 # Ham servers
 SERVERS=(
-# nothing at the moment
+  apache
+  mariadb
 )
 
 # Ham server utilities
 UTILITIES=(
   nodejs
   npm
+  wget
+  php
 )