diff --git a/.gitignore b/.gitignore
index 982cdab..7098a63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,13 +2,18 @@
mysql-data/
logs/
-# Node modules (if any)
-node_modules/
-
# OS generated files
.DS_Store
Thumbs.db
# Temporary files
*.tmp
-*.temp
\ No newline at end of file
+*.temp
+
+# Sensitive configuration files
+config/*.env
+*.pem
+
+# Sensitive configuration files
+config/*.env
+*.pem
\ No newline at end of file
diff --git a/000-default.conf b/000-default.conf
new file mode 100644
index 0000000..7a21c74
--- /dev/null
+++ b/000-default.conf
@@ -0,0 +1,12 @@
+
+ ServerAdmin webmaster@localhost
+ DocumentRoot /var/www/html/
+
+
+ AllowOverride All
+ Require all granted
+
+
+ ErrorLog ${APACHE_LOG_DIR}/error.log
+ CustomLog ${APACHE_LOG_DIR}/access.log combined
+
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 51793af..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-version: '3.8'
-
-services:
- dustins-fault:
- build: .
- container_name: dustins-fault-website
- ports:
- - "8080:80"
- - "8443:443" # Because why not have HTTPS for a joke site?
- volumes:
- - ./logs:/usr/local/apache2/logs
- environment:
- - APACHE_RUN_USER=www-data
- - APACHE_RUN_GROUP=www-data
- - APACHE_LOG_DIR=/usr/local/apache2/logs
- - TZ=America/New_York
- restart: unless-stopped
- networks:
- - dustins-fault-net
- labels:
- - "com.dustinsfault.description=Website blaming Dustin for everything"
- - "com.dustinsfault.blame-level=maximum"
- - "com.dustinsfault.apologies-required=infinite"
-
- # Because why not add a MySQL database to track all the things Dustin has fucked up?
- dustins-fault-db:
- image: mysql:8.0
- container_name: dustins-fault-database
- environment:
- - MYSQL_ROOT_PASSWORD=itsdustinsfault
- - MYSQL_DATABASE=dustins_faults
- - MYSQL_USER=dustin
- - MYSQL_PASSWORD=blame_me
- volumes:
- - ./mysql-data:/var/lib/mysql
- - ./mysql-init:/docker-entrypoint-initdb.d
- networks:
- - dustins-fault-net
- restart: unless-stopped
- labels:
- - "com.dustinsfault.purpose=Track Dustin's endless fuckups"
-
- # And a phpMyAdmin because we're fancy like that
- phpmyadmin:
- image: phpmyadmin/phpmyadmin
- container_name: dustins-fault-phpmyadmin
- environment:
- - PMA_HOST=dustins-fault-db
- - PMA_PORT=3306
- - PMA_ARBITRARY=1
- ports:
- - "8081:80"
- networks:
- - dustins-fault-net
- restart: unless-stopped
- labels:
- - "com.dustinsfault.purpose=View database of Dustin's sins"
-
-networks:
- dustins-fault-net:
- driver: bridge
- name: dustins-fault-network
\ No newline at end of file
diff --git a/www/404.html b/www/404.html
index af4e7b4..0ce8cc5 100644
--- a/www/404.html
+++ b/www/404.html
@@ -1,15 +1,15 @@
-
+
Error - Dustin's Fault
-ERROR 404 - PAGE NOT FOUND
+Error 404 - Page Not Found
This page doesn't exist. You know who to blame.
_____
@@ -22,5 +22,6 @@ pre{color:#ff0}
It's Dustin's fault. Obviously.
Go back to blaming Dustin properly
+If you actually like Dustin, you might want to rethink your life choices!
Because nobody should be this unlucky!
-
\ No newline at end of file
+
diff --git a/www/cgi-bin/blame-dustin.cgi b/www/cgi-bin/blame-dustin.cgi
index 24bb27a..2e1c439 100755
--- a/www/cgi-bin/blame-dustin.cgi
+++ b/www/cgi-bin/blame-dustin.cgi
@@ -1,5 +1,8 @@
#!/bin/sh
+# Security note: Sanitize inputs and control command execution carefully
+
+# Print header
echo "Content-type: text/html"
echo ""
@@ -61,32 +64,25 @@ pre {
$(/usr/bin/fortune)
-
Dustin's fault level: $(echo $((RANDOM % 100 + 1)) )%
-
Figlet says:
$(echo "DUSTIN'S FAULT" | /usr/bin/figlet)
-
-$(echo "I'm sorry. It's my fault. I fucked up." | /usr/bin/lolcat)
+$(echo "I'm sorry. It's my fault. I messed up." | /usr/bin/lolcat)
-
BLAME LEVEL: MAXIMUM
Current blame allocation: 100% Dustin's Fault
-
-
-← Back to the main blame portal
-
+↩️ Back to the main blame portal
Server time: $(date)
This page has been viewed $(echo $RANDOM) times by people blaming Dustin.
Total apologies generated: $(echo $((RANDOM * 1000)))