diff --git a/Dockerfile b/Dockerfile index b8d8779b..16dbab17 100644 --- a/Dockerfile +++ b/Dockerfile @@ -57,5 +57,6 @@ ENTRYPOINT ["/var/www/fic-server/entrypoint.sh"] CMD service nginx start && \ service php5-fpm start && \ ./nginx_gen_team.sh > ./shared/nginx-teams.conf && \ + chown www-data ./shared/nginx-teams.conf && \ (./launch.sh &); \ /bin/bash diff --git a/entrypoint.sh b/entrypoint.sh index bdd975ec..f16170a4 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -8,8 +8,8 @@ cd `dirname "$0"` # Creating directory and set permissions mkdir -p ${BASEDIR}/logs ${BASEDIR}/onyx/log -chown -R www-data:www-data ${BASEDIR}/shared ${BASEDIR}/pki ${BASEDIR}/PKI ${BASEDIR}/onyx/log -chown -R ${SYNCHRO_USER}:www-data ${BASEDIR}/submission ${BASEDIR}/logs ${BASEDIR}/out ${BASEDIR}/shared/nginx-teams.conf +chown -R www-data:www-data ${BASEDIR}/pki ${BASEDIR}/PKI ${BASEDIR}/onyx/log +chown -R ${SYNCHRO_USER}:www-data ${BASEDIR}/submission ${BASEDIR}/logs ${BASEDIR}/out chmod 770 ${BASEDIR}/submission chown ${SYNCHRO_USER} ${BASEDIR}/.ssh/id_rsa diff --git a/front_synchro/Dockerfile b/front_synchro/Dockerfile index ba306392..c10028ed 100644 --- a/front_synchro/Dockerfile +++ b/front_synchro/Dockerfile @@ -26,5 +26,6 @@ EXPOSE 22/tcp CMD chown -R synchro /var/www/fic-server/ && \ chmod 755 /var/www/fic-server/ && \ + chmod 775 /var/www/fic-server/submission/ && \ service ssh start && \ tail -F /var/log/auth.log diff --git a/synchro.sh b/synchro.sh index 5e1d145d..7c3c0680 100755 --- a/synchro.sh +++ b/synchro.sh @@ -28,6 +28,6 @@ rsync -e "$SSH_OPTS" -av $OPTS front shared "$FRONTEND_HOSTNAME":~/ # Synchronize submissions rsync -e "$SSH_OPTS" -av "$FRONTEND_HOSTNAME":~/submission/ submission/ -ssh -p 2242 -i .ssh/id_rsa "$FRONTEND_HOSTNAME" "rm -fv ~/submission/*" +ssh -o 'UserKnownHostsFile=/dev/null' -o 'StrictHostKeyChecking=no' -p 2242 -i .ssh/id_rsa "$FRONTEND_HOSTNAME" "rm -fv ~/submission/*" exit $?