fixing cloudlog

This commit is contained in:
David Young
2026-04-11 06:51:32 -06:00
parent d189262293
commit 3155d10b51

View File

@@ -159,8 +159,10 @@ CLOUDLOG_DB="cloudlog"
CLOUDLOG_DB_USER="cloudlog" CLOUDLOG_DB_USER="cloudlog"
CLOUDLOG_DB_PASS="cloudlog" CLOUDLOG_DB_PASS="cloudlog"
if [ ! -d "$CLOUDLOG_DIR" ]; then install_cloudlog() {
local reinstall="${1:-false}"
echo "Installing Cloudlog..." echo "Installing Cloudlog..."
sudo rm -rf "$CLOUDLOG_DIR"
sudo git clone https://github.com/magicbug/Cloudlog.git "$CLOUDLOG_DIR" sudo git clone https://github.com/magicbug/Cloudlog.git "$CLOUDLOG_DIR"
# Set ownership and permissions (Arch Apache runs as 'http') # Set ownership and permissions (Arch Apache runs as 'http')
@@ -169,17 +171,36 @@ if [ ! -d "$CLOUDLOG_DIR" ]; then
# Create MariaDB database and user # Create MariaDB database and user
echo "Creating Cloudlog database..." echo "Creating Cloudlog database..."
if [ "$reinstall" = "true" ]; then
sudo mariadb -u root <<EOF
DROP DATABASE IF EXISTS ${CLOUDLOG_DB};
DROP USER IF EXISTS '${CLOUDLOG_DB_USER}'@'localhost';
CREATE DATABASE ${CLOUDLOG_DB};
CREATE USER '${CLOUDLOG_DB_USER}'@'localhost' IDENTIFIED BY '${CLOUDLOG_DB_PASS}';
GRANT ALL PRIVILEGES ON ${CLOUDLOG_DB}.* TO '${CLOUDLOG_DB_USER}'@'localhost';
FLUSH PRIVILEGES;
EOF
else
sudo mariadb -u root <<EOF sudo mariadb -u root <<EOF
CREATE DATABASE IF NOT EXISTS ${CLOUDLOG_DB}; CREATE DATABASE IF NOT EXISTS ${CLOUDLOG_DB};
CREATE USER IF NOT EXISTS '${CLOUDLOG_DB_USER}'@'localhost' IDENTIFIED BY '${CLOUDLOG_DB_PASS}'; 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'; GRANT ALL PRIVILEGES ON ${CLOUDLOG_DB}.* TO '${CLOUDLOG_DB_USER}'@'localhost';
FLUSH PRIVILEGES; FLUSH PRIVILEGES;
EOF EOF
fi
sudo systemctl restart httpd sudo systemctl restart httpd
echo "Cloudlog installed. Complete setup by visiting http://localhost/cloudlog/install" echo "Cloudlog installed. Complete setup by visiting http://localhost/cloudlog/install"
}
if [ ! -d "$CLOUDLOG_DIR" ]; then
install_cloudlog
else else
echo "Cloudlog is already installed, skipping." read -rp "Cloudlog is already installed. Re-install? [y/N] " response </dev/tty
case "$response" in
[yY][eE][sS]|[yY]) install_cloudlog true ;;
*) echo "Cloudlog installation skipped." ;;
esac
fi fi
# Install Cockpit # Install Cockpit