diff --git a/install.sh b/install.sh index d4c75f4..205e02f 100755 --- a/install.sh +++ b/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 <