Revert "do not mount www&ftp data"

This reverts commit c5e3a0d.

Author: alexcos20

additional-modules/storage/entrypoint.sh

@@ -113,11 +113,8 @@ chown -R ceph:ceph /var/lib/ceph/radosgw
 # start Apache and vsftpd (/var/www/html and /srv/ftp are volume bindings from start_ocean.sh)
 ##
 echo "starting apache2 and vsftpd..."
-# Host dirs are created by root ; set broad perms so www-data and FTP user can write
-mkdir -p /var/www/html
-mkdir -p /srv/ftp
+# Host dirs are created by root in start_ocean.sh; set broad perms so www-data and FTP user can write
 chmod 777 /var/www/html 2>/dev/null || true
-chmod 777 /srv 2>/dev/null || true
 chmod 777 /srv/ftp 2>/dev/null || true
 # Create FTP user if missing, set password from env
 if ! id -u "$FTP_USER" >/dev/null 2>&1; then

compose-files/storage.yml

@@ -19,4 +19,8 @@ services:
       FTP_PASS: "${FTP_PASS:-ftppass}"
     networks:
       ocean_backend:
-        ipv4_address: 172.15.0.7
+        ipv4_address: 172.15.0.7
+    volumes:
+    # OCEAN_WWW_FOLDER, OCEAN_FTP_FOLDER set in start_ocean.sh (e.g. ~/.ocean/storage-www, ~/.ocean/storage-ftp)
+    - ${OCEAN_WWW_FOLDER}:/var/www/html
+    - ${OCEAN_FTP_FOLDER}:/srv/ftp

start_ocean.sh

@@ -74,6 +74,13 @@ mkdir -p ${OCEAN_CERTS_FOLDER}
 # copy certs
 cp -r ./certs/* ${OCEAN_CERTS_FOLDER}
 
+#www folder
+export OCEAN_WWW_FOLDER="${OCEAN_HOME}/storage-www/"
+mkdir -p ${OCEAN_WWW_FOLDER}
+#ftp folder
+export OCEAN_FTP_FOLDER="${OCEAN_HOME}/storage-ftp/"
+mkdir -p ${OCEAN_FTP_FOLDER}
+chmod 777 ${OCEAN_FTP_FOLDER}
 # FTP local user (no anonymous); set FTP_USER/FTP_PASS to override
 export FTP_USER="${FTP_USER:-ftpuser}"
 export FTP_PASS="${FTP_PASS:-ftppass}"