Fix storage volume config for the nginx service (#22409)

conftest.py

@@ -185,7 +185,6 @@ def test_pre_setup(request, tmpdir, settings):
     settings.SHARED_STORAGE = shared_storage = _path(storage_root, 'shared_storage')
 
     settings.ADDONS_PATH = _path(storage_root, 'files')
-    settings.GUARDED_ADDONS_PATH = _path(storage_root, 'guarded-addons')
     settings.GIT_FILE_STORAGE_PATH = _path(storage_root, 'git-storage')
     settings.MLBF_STORAGE_PATH = _path(storage_root, 'mlbf')
     settings.MEDIA_ROOT = _path(shared_storage, 'uploads')

docker-compose.yml

@@ -74,10 +74,7 @@ services:
       - ./docker/nginx/addons.conf:/etc/nginx/conf.d/addons.conf
       - ./static:/srv/static
       - ./site-static:/srv/site-static
-      - storage:/shared_storage/uploads:/srv/user-media
-      - storage:/files:/srv/user-media/addons
-      - storage:/guarded-addons:/srv/user-media/guarded-addons
-      - storage:/sitemaps:/srv/user-media/sitemaps
+      - storage:/srv/user-media
     ports:
       - "80:80"
     networks:

docker/nginx/addons.conf

@@ -5,25 +5,9 @@ merge_slashes off;
 server {
     listen  80 default;
 
-    location /data/olympia/storage/files/ {
+    location /data/olympia/storage/ {
         internal;
-        # This matches where addons-server `docker-compose.yml` mounts
-        # `./storage/addons/` - as `/srv/user-media/addons/`
-        alias /srv/user-media/addons/;
-    }
-
-    location /data/olympia/storage/guarded-addons/ {
-        internal;
-        # This matches where addons-server `docker-compose.yml` mounts
-        # `./storage/guarded-addons/` - as `/srv/user-media/guarded-addons/`
-        alias /srv/user-media/guarded-addons/;
-    }
-
-    location /data/olympia/storage/sitemaps/ {
-        internal;
-        # This matches where addons-server `docker-compose.yml` mounts
-        # `./storage/sitemaps/` - as `/srv/user-media/sitemaps/`
-        alias /srv/user-media/sitemaps/;
+        alias /srv/user-media/;
     }
 
     location /static/ {