From 3422a4aa9296d71a3899336f23c724c7909600ed Mon Sep 17 00:00:00 2001
From: jwansek <eddie.atten.ea29@gmail.com>
Date: Wed, 10 Aug 2022 18:15:23 +0000
Subject: Fixed issue with docker-compose, added to example config

---
 docker-compose.yml  |  2 ++
 edaweb.conf.example | 37 +++++++++++++++++++++++++++++++++++++
 example.conf        | 34 ----------------------------------
 static/index.md     |  3 ---
 4 files changed, 39 insertions(+), 37 deletions(-)
 create mode 100755 edaweb.conf.example
 delete mode 100755 example.conf

diff --git a/docker-compose.yml b/docker-compose.yml
index c6762fc..d881761 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,6 +13,8 @@ services:
             - "6969:6969"
         networks:
             - db-network
+        external_links:
+            - mariadb:mysql
 
 networks:
     db-network:
diff --git a/edaweb.conf.example b/edaweb.conf.example
new file mode 100755
index 0000000..074a3f3
--- /dev/null
+++ b/edaweb.conf.example
@@ -0,0 +1,37 @@
+[mysql]
+host = mysql
+; port = 3306   ; ConfigParser will parse this as a string (not int) which will cause pymysql to moan
+user = webro
+passwd = ***********
+db = edaweb
+
+[nitter]
+url = 192.168.1.92
+port = 7777
+domain = nitter.eda.gay
+
+[docker]
+url = 192.168.1.5
+port = 4550
+
+[pihole]
+url = 192.168.1.3:81
+
+[transmission]
+url = 192.168.1.5
+port = 9092
+
+[discord]
+username = @eden#7623
+
+[servicetimeout]
+seconds = 2
+
+[github]
+client_id = *******************
+client_secret = **********************************
+access_code = *******************************
+
+[cds]
+location = /media/ISOs/
+maxsize = 700000000
diff --git a/example.conf b/example.conf
deleted file mode 100755
index 4110f3d..0000000
--- a/example.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-[mysql]
-host = mariadb
-user = webro
-passwd = ***********
-db = edaweb
-
-[nitter]
-url = 192.168.0.40
-port = 7777
-
-[docker]
-url = 192.168.0.40
-port = 4550
-
-[pihole]
-url = 192.168.0.25
-
-[qbittorrent]
-url = 192.168.0.25
-port = 8080
-user = admin
-passwd = ***********
-
-[transmission]
-url = 192.168.0.25
-port = 9091
-user = admin
-passwd = ***********
-
-[discord]
-username = @jwnskanzkwk#9757
-
-[github]
-access_code = *******************************************
diff --git a/static/index.md b/static/index.md
index d82a2ed..c76e65e 100755
--- a/static/index.md
+++ b/static/index.md
@@ -8,9 +8,6 @@ i'll post my thoughts on here sometimes, and use this site to link to other stuf
 
 ## FOSS alternative services
 
-*because I'm currently in the process of moving house, the [server situation](https://eda.gay/thought?id=17) is different so these services may or may not be online right now. also  its why [the services page](https://eda.gay/services) is broken atm.*
-
-
 - [nextcloud - dropbox (+ much more!) alternative](https://nc.eda.gay)
 - [invidious - youtube alternative](https://invidious.eda.gay)
 - [nitter - alternative twitter frontend](https://nitter.eda.gay)
-- 
cgit v1.2.3