diff --git a/front/Dockerfile b/front/Dockerfile index 5ed4054a..8a0cf970 100644 --- a/front/Dockerfile +++ b/front/Dockerfile @@ -30,6 +30,7 @@ RUN ln -sf /var/www/fic-server/front/nginx.conf /etc/nginx/sites-enabled/default EXPOSE 80/tcp 443/tcp -CMD service nginx start && \ +CMD cp -r out/errors shared/ && \ + service nginx start && \ service php5-fpm start && \ /bin/bash diff --git a/front/nginx.conf b/front/nginx.conf index 76aa1a37..af60f533 100644 --- a/front/nginx.conf +++ b/front/nginx.conf @@ -58,7 +58,7 @@ server { location /errors { - root /var/www/fic-server/out/; + root /var/www/fic-server/shared; } location /challenge diff --git a/synchro.sh b/synchro.sh index 7c3c0680..f8b94cb4 100755 --- a/synchro.sh +++ b/synchro.sh @@ -24,10 +24,10 @@ fi # Synchronize HTML pages rsync -e "$SSH_OPTS" -av $OPTS out "$FRONTEND_HOSTNAME":~/ rsync -e "$SSH_OPTS" -avL $OPTS files "$FRONTEND_HOSTNAME":~/ -rsync -e "$SSH_OPTS" -av $OPTS front shared "$FRONTEND_HOSTNAME":~/ +rsync -e "$SSH_OPTS" -av front shared "$FRONTEND_HOSTNAME":~/ # Synchronize submissions rsync -e "$SSH_OPTS" -av "$FRONTEND_HOSTNAME":~/submission/ submission/ -ssh -o 'UserKnownHostsFile=/dev/null' -o 'StrictHostKeyChecking=no' -p 2242 -i .ssh/id_rsa "$FRONTEND_HOSTNAME" "rm -fv ~/submission/*" +$SSH_OPTS "$FRONTEND_HOSTNAME" "rm -fv ~/submission/*" exit $?