Merge branch 'bdlamprecht-moving_env_files'

docker-compose.yml

@@ -10,7 +10,7 @@ services:
     - postgres
     - redis
     - netbox-worker
-    env_file: netbox.env
+    env_file: env/netbox.env
     volumes:
     - ./startup_scripts:/opt/netbox/startup_scripts:ro
     - ./initializers:/opt/netbox/initializers:ro
@@ -40,7 +40,7 @@ services:
     - netbox-nginx-config:/etc/netbox-nginx/:ro
   postgres:
     image: postgres:10.4-alpine
-    env_file: postgres.env
+    env_file: env/postgres.env
     volumes:
     - netbox-postgres-data:/var/lib/postgresql/data
   redis:
@@ -49,7 +49,7 @@ services:
     - sh
     - -c # this is to evaluate the $REDIS_PASSWORD from the env
     - redis-server --appendonly yes --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
-    env_file: redis.env
+    env_file: env/redis.env
     volumes:
     - netbox-redis-data:/data
 volumes: