-# Any of these can fail, since they may already exist
-mkdir /citadel-data
-mkdir -p /citadel-data/data
-mkdir -p /citadel-data/files
-mkdir -p /citadel-data/keys
+# Create symlinks into the volume subdirectories, from where our programs expect them to be.
+ln -sfv /citadel-data/data /usr/local/citadel/
+ln -sfv /citadel-data/files /usr/local/citadel/
+ln -sfv /citadel-data/keys /usr/local/citadel/
+ln -sfv /citadel-data/keys /usr/local/webcit/