diff --git a/Caddyfile b/Caddyfile index 24ca219..31efa9d 100644 --- a/Caddyfile +++ b/Caddyfile @@ -120,16 +120,3 @@ https://staging.msfjarvis.dev { 404 404.html } } - -https://stats.msfjarvis.dev { - import base_config - import compression_config - root /var/www/stats.msfjarvis.dev/ -} - -https://stats.msfjarvis.dev/ws { - import base_config - proxy / localhost:7890 { - websocket - } -} diff --git a/README.md b/README.md index 6c94854..44ea002 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,6 @@ Configuration files for various parts of my webserver - [Caddyfile](Caddyfile): Configuration file for [caddyserver](https://caddyserver.com) instance that powers everything on my webserver. - [systemd-units](systemd_units): Systemd units for various custom services I have on the webserver. - [caddy.service](systemd_units/caddy.service): Unit for the caddyserver instance that powers everything. - - [goaccess.service](systemd_units/goaccess.service): Unit for the [GoAccess](https://goaccess.io) instance that powers [stats.msfjarvis.dev](https://stats.msfjarvis.dev) - [mirror-bot.service](systemd_units/mirror-bot.service), [mirror-bot-2.service](systemd_units/mirror-bot-2.service): Systemd units for my copies of [aria-telegram-mirror-bot](https://github.com/out386/aria-telegram-mirror-bot). - [uno-bot.service](systemd_units/uno-bot.service): Service unit for the [mau_mau_bot](https://github.com/msfjarvis/mau_mau_bot) instance I run to play UNO with friends. - [walls-bot.service](systemd_units/walls-bot.service): Unit for the [walls-bot](https://github.com/msfjarvis/walls-bot) instance I run for my desktop walls collections. diff --git a/systemd_units/goaccess-update.timer b/systemd_units/goaccess-update.timer deleted file mode 100644 index 1c3b2f6..0000000 --- a/systemd_units/goaccess-update.timer +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Run goaccess every 10 minutes to update statistics -Requires=goaccess.service - -[Timer] -Unit=goaccess.service -OnUnitInactiveSec=10m -RandomizedDelaySec=10m -AccuracySec=1s - -[Install] -WantedBy=timers.target diff --git a/systemd_units/goaccess.service b/systemd_units/goaccess.service deleted file mode 100644 index c66855f..0000000 --- a/systemd_units/goaccess.service +++ /dev/null @@ -1,31 +0,0 @@ -[Unit] -Description=goaccess: real-time web log analyzer -After=syslog.target -After=network.target - -[Service] -LimitMEMLOCK=infinity -LimitNOFILE=65535 -RestartSec=2s -Type=simple -User=caddy -Group=caddy -ExecStart=/usr/bin/goaccess --log-format=VCOMMON --output=/var/www/stats.msfjarvis.dev/index.html --log-file=/etc/logs/requests.log --no-query-string --anonymize-ip --double-decode --real-os --compression=zlib -Restart=always - -# Security -PrivateTmp=true -ProtectSystem=full -ProtectHome=true -NoNewPrivileges=true -ProtectControlGroups=true -ProtectKernelModules=true -ProtectKernelTunables=true -PrivateDevices=true -RestrictAddressFamilies=AF_INET AF_INET6 -RestrictNamespaces=true -RestrictRealtime=true -SystemCallArchitectures=native - -[Install] -WantedBy=multi-user.target diff --git a/systemd_units/update.sh b/systemd_units/update.sh index 8945e66..36ae2eb 100755 --- a/systemd_units/update.sh +++ b/systemd_units/update.sh @@ -8,8 +8,7 @@ function prettyPrint() { } # Grab all service names -declare -a services=('caddy' 'goaccess' 'mirror-bot' 'mirror-bot-2' 'uno-bot' 'pyrobud' 'walls-bot' 'walls-bot-rs') -declare -a timers=('goaccess-update') +declare -a services=('caddy' 'mirror-bot' 'mirror-bot-2' 'uno-bot' 'pyrobud' 'walls-bot' 'walls-bot-rs') # Now loop through each service and install it for service in "${services[@]}"; do @@ -30,18 +29,3 @@ for service in "${services[@]}"; do fi fi done - -for timer in "${timers[@]}"; do - if [ "${1}" ] && [[ ${timer} != "${1}" && "${timer}.timer" != "${1}" ]]; then - continue - fi - prettyPrint "Checking root access" - sudo -v || return 1 - prettyPrint "Installing ${timer}" - sudo cp -v "${timer}.timer" /etc/systemd/system/ - sudo systemctl daemon-reload - if [ -z "${NO_RESTART}" ]; then - prettyPrint "Enabling ${timer}" - sudo systemctl enable "${timer}.timer" - fi -done