diff options
| author | jwansek <eddie.atten.ea29@gmail.com> | 2022-08-10 18:15:23 +0000 |
|---|---|---|
| committer | jwansek <eddie.atten.ea29@gmail.com> | 2022-08-10 18:15:23 +0000 |
| commit | 3422a4aa9296d71a3899336f23c724c7909600ed (patch) | |
| tree | b9495eb441732d856db6d8d1c95b51a722140f02 | |
| parent | 24c772019f3fd9b9b39b60e7129555929b8869ef (diff) | |
| download | boymoder.blog-3422a4aa9296d71a3899336f23c724c7909600ed.tar.gz boymoder.blog-3422a4aa9296d71a3899336f23c724c7909600ed.zip | |
Fixed issue with docker-compose, added to example config
| -rwxr-xr-x | docker-compose.yml | 2 | ||||
| -rwxr-xr-x | edaweb.conf.example | 37 | ||||
| -rwxr-xr-x | example.conf | 34 | ||||
| -rwxr-xr-x | static/index.md | 3 |
4 files changed, 39 insertions, 37 deletions
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) |