From da1e9da4952386c7f18ec3d88cc61400ffb62d0a Mon Sep 17 00:00:00 2001
From: Nemunaire <nemunaire@nemunai.re>
Date: Sun, 28 Dec 2014 14:51:40 +0100
Subject: [PATCH] Fix some permission issues

---
 Dockerfile      |  7 ++++++-
 gen_site.pl     |  1 +
 launch_local.sh | 12 ++++++------
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b7e19797..bfb00138 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,6 +29,8 @@ RUN apt-get -y update && \
 
 RUN cpanm Mcrypt
 
+RUN useradd -d /var/www/fic-server/misc/ -M -N -g www-data synchro
+
 WORKDIR /var/www/fic-server/misc
 
 # Copying files #######################################################
@@ -65,7 +67,10 @@ RUN ln -sf /var/www/fic-server/onyx/config/sample.root.xml /var/www/fic-server/o
 EXPOSE 80/tcp 443/tcp
 VOLUME ["/var/www/fic-server/out","/var/www/fic-server/files","/var/www/fic-server/submission","/var/www/fic-server/misc/shared"]
 
-CMD    chown -R www-data:www-data /var/www/fic-server/misc /var/www/fic-server/submission; \
+CMD    mkdir -p /var/www/fic-server/logs; \
+       chown -R www-data:www-data /var/www/fic-server/misc; \
+       chown -R synchro:www-data /var/www/fic-server/submission /var/www/fic-server/logs /var/www/fic-server/out; \
+       chmod 660 /var/www/fic-server/submission; \
        if ! [ -f server.crt ]; \
        then \
            bash ./CA.sh -newserver; \
diff --git a/gen_site.pl b/gen_site.pl
index c21da15f..0345b674 100755
--- a/gen_site.pl
+++ b/gen_site.pl
@@ -348,6 +348,7 @@ sub create_socket
 	Type   => SOCK_STREAM,
 	Listen => SOMAXCONN,
 	);
+    chmod 0660, $socket_path;
     say "Socket listening on $socket_path; waiting for connections...";
 
     while(my $connection = $socket->accept)
diff --git a/launch_local.sh b/launch_local.sh
index 49d9afb3..a96bb433 100755
--- a/launch_local.sh
+++ b/launch_local.sh
@@ -7,12 +7,12 @@ cd `dirname "$0"`
 
 source config.sh
 
-#if [ "$UID" = "0" ]
-#then
-#    SCRIPT=`pwd`/`basename "$0"`
-#    su -c "sh $SCRIPT" "$SYNCHRO_USER"
-#    exit $?
-#fi
+if [ "$UID" = "0" ]
+then
+    SCRIPT=`pwd`/`basename "$0"`
+    su -c "sh $SCRIPT" "$SYNCHRO_USER"
+    exit $?
+fi
 
 mkdir -p ./logs