Merge da quell'antipatico di boyska che mi cambia tutte le porte

Makefile

@@ -15,5 +15,5 @@ build: fix-permissions
 	docker exec -t $$(docker ps -qf name=feedati_db) rm -f /tmp/ttrss.sql
 	docker-compose stop
 
-run:
+run: fix-permissions
 	docker-compose up

docker-compose.yml

@@ -19,7 +19,7 @@ services:
             dockerfile: ./docker/Dockerfile-tt-rss
         volumes:
             - ./tt-rss:/var/www/html/tt-rss
-            - ./docker/config.php:/var/www/html/tt-rss/config.php:ro
+            - ./docker/ttrss-config.php:/var/www/html/tt-rss/config.php:ro
         ports:
             - 8000:80
             - 9312:9312
@@ -30,11 +30,13 @@ services:
             context: ./rss-bridge/
         ports:
             - 8001:80
+        environment:
+            - APACHE_SERVER_NAME=rss-bridge
 
     webserver:
         image: nginx:latest
         volumes:
-            - ./docker/rss.conf:/etc/nginx/conf.d/default.conf:ro
+            - ./docker/nginx.conf:/etc/nginx/conf.d/default.conf:ro
         ports:
             - 80:80