From 8150782067a4c543bcbc37f5138b976655ae0354 Mon Sep 17 00:00:00 2001
From: meliurwen <meliurwen@gmail.com>
Date: Wed, 26 Aug 2020 16:49:18 +0200
Subject: [PATCH] Renamed fw_config.env.example to funkwhale.env.example and
 updated docker-compose.yml

---
 .env.example                                   | 4 +++-
 docker-compose.yml                             | 6 +++---
 fw_config.env.example => funkwhale.env.example | 0
 3 files changed, 6 insertions(+), 4 deletions(-)
 rename fw_config.env.example => funkwhale.env.example (100%)

diff --git a/.env.example b/.env.example
index f90a25a..829bccf 100644
--- a/.env.example
+++ b/.env.example
@@ -22,11 +22,13 @@ FUNKWHALE_VERSION=
 # Networks
 # Name of the external network of the reverse proxy
 REVERSE_PROXY_NETWORK=webservices
+
+# Networks (optional)
 # Restrict internet access to the whole Funkwhale app
 # Note: It will be normally reachable from the web (via the reverse-proxy), but
 #       the containers cannot make external calls on their own, thus no
 #       federation or anything that may require internet from the server side.
-NO_INTERNET_ACC=false
+NO_INTERNET_ACC=true
 
 # postgres (optional)
 DB_IMG=
diff --git a/docker-compose.yml b/docker-compose.yml
index b68df78..5d9390c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -35,7 +35,7 @@ services:
       - "${HOST_MUSIC_DIRECTORY_PATH}:/data/music:ro"
       - "${HOST_MEDIA_ROOT}:/data/media"
     env_file:
-      - fw_config.env
+      - funkwhale.env
       - paths.env
     environment:
       - C_FORCE_ROOT=true
@@ -50,7 +50,7 @@ services:
       - postgres
       - redis
     env_file:
-      - fw_config.env
+      - funkwhale.env
     environment:
       - FUNKWHALE_HOSTNAME=${FUNKWHALE_HOSTNAME} # This is necessary
     command: celery -A funkwhale_api.taskapp beat --pidfile= -l INFO
@@ -73,7 +73,7 @@ services:
     expose:
       - 5000
     env_file:
-      - fw_config.env
+      - funkwhale.env
       - paths.env
     environment:
       - FUNKWHALE_HOSTNAME=${FUNKWHALE_HOSTNAME}
diff --git a/fw_config.env.example b/funkwhale.env.example
similarity index 100%
rename from fw_config.env.example
rename to funkwhale.env.example