From 16f79f9ff27c06990878e940101d965069688055 Mon Sep 17 00:00:00 2001 From: wait-what <25844213+wait-what@users.noreply.github.com> Date: Tue, 23 Apr 2024 00:45:59 +0300 Subject: [PATCH] revert original config file and update explanation --- config.json | 14 +++++++------- docker-compose.yml | 23 ++++++++++++++++++----- docker/poke.json | 17 +++++++++++++++++ 3 files changed, 42 insertions(+), 12 deletions(-) create mode 100644 docker/poke.json diff --git a/config.json b/config.json index b48cf3f3..4924960c 100644 --- a/config.json +++ b/config.json @@ -1,11 +1,11 @@ { - "tubeApi": "http://lighttube:80/api", - "invapi": "http://invidious:3000/api/v1", + "tubeApi": "https://inner-api.poketube.fun/api/", + "invapi": "https://invid-api.poketube.fun/api/v1", "dislikes": "https://returnyoutubedislikeapi.com/votes?videoId=", - "invchannel": "http://invidious:3000/api/v1", - "p_url": "http://p.poketube.test", - "media_proxy": "http://image-proxy.poketube.test", - "videourl": "http://eu-proxy.poketube.test", + "invchannel": "https://invid-api.poketube.fun/api/v1", + "p_url": "https://p.poketube.fun", + "media_proxy": "https://image-proxy.poketube.fun", + "videourl": "https://eu-proxy.poketube.fun", "email_main_url": "https://email-server.poketube.fun", "mastodon_client_url": "https://fediverse.poketube.fun", "libreoffice_online_url": "https://office.poketube.fun", @@ -14,4 +14,4 @@ "proxylocation": "USA", "t_url": "https://t.poketube.fun/", "server_port": "6003" -} +} \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index e02fb6fc..a50daa59 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,10 +2,23 @@ # 1. Verify you have docker and docker-compose # 2. Make sure this repository is cloned recursively (check if the `pokevidious` folder has stuff in it) -# 3. Adjust domains in `docker/Caddyfile` and `config.json` -# DO NOT touch tubeApi, invapi, invchannel, videourl in `config.json` unless you know what you are doing -# 4. Optionally replace `build` with `image` in some services to save time on building -# 5. Run `docker-compose up -d` or `docker compose up -d` (notice the dash) +# 3. Optionally replace `build` with `image` in some services to save time on building +# 4. Proceed either to Section A or Section B + +# Section A : Local development +# 1. Add this to your hosts file /etc/hosts (Linux) or C:\Windows\System32\drivers\etc\hosts (Windows) +# +# 127.0.0.1 poketube.test image-proxy.poketube.test eu-proxy.poketube.test p.poketube.test +# +# 2. Run `docker-compose up -d` or `docker compose up -d` (notice the dash) +# 3. Visit `http://poketube.test` in your browser + +# Section B : Production +# 3. Adjust domains in `docker/Caddyfile` and `docker/config.json` +# 3.1 DO NOT touch tubeApi, invapi, invchannel, videourl in `docker/config.json` unless you know what you are doing +# 3.2 As for the others, make sure they're all https in both files +# 4. Run `docker-compose up -d` or `docker compose up -d` (notice the dash) +# 5. Visit your domain in your browser services: poketube: # port 6003 @@ -19,7 +32,7 @@ services: - january restart: unless-stopped volumes: - - ./config.json:/poketube/config.json:ro + - ./docker/poke.json:/poketube/config.json:ro # lighttube - tubeApi lighttube: # port 80 diff --git a/docker/poke.json b/docker/poke.json new file mode 100644 index 00000000..77ec6984 --- /dev/null +++ b/docker/poke.json @@ -0,0 +1,17 @@ +{ + "tubeApi": "http://lighttube:80/api", + "invapi": "http://invidious:3000/api/v1", + "dislikes": "https://returnyoutubedislikeapi.com/votes?videoId=", + "invchannel": "http://invidious:3000/api/v1", + "p_url": "http://p.poketube.test", + "media_proxy": "http://image-proxy.poketube.test", + "videourl": "http://eu-proxy.poketube.test", + "email_main_url": "https://email-server.poketube.fun", + "mastodon_client_url": "https://fediverse.poketube.fun", + "libreoffice_online_url": "https://office.poketube.fun", + "cacher_max_age": "864000", + "enablealwayshttps": false, + "proxylocation": "USA", + "t_url": "https://t.poketube.fun/", + "server_port": "6003" +} \ No newline at end of file