mv the chown /var/gavo/logs

Chloé Azria
1 parent d2ebcd28
Showing 3 changed files with 7 additions and 10 deletions Show diff stats
conf/.env
conf/dachs-dockerfile
conf/docker-entrypoint.sh
@@ -7,7 +7,7 @@ GITREPO_SERVER=voparis-tap-example
  
  
  
-#########Be careful, the .env parameters have priority on gavo.rc from gitlab
+#########Be careful, the .env parameters overwrites the gavo.rc from gitlab
  
 #Following parameters will take default values if commented :
 DACHS_PORT=81
@@ -80,22 +80,18 @@ RUN if [ &quot;$SERVERNAME&quot; = &quot;localhost&quot; ]; then \
     ;fi
  
 ##Adapt gavo.rc with ports and server name
-
+RUN echo "initial gavo.rc" && less /etc/gavo.rc
 RUN sed -i "/serverPort/c\serverPort:${DACHS_PORT}"  /etc/gavo.rc
 RUN sed -i "/corsOriginPat/c\corsOriginPat:${PROTOCOL}.*" /etc/gavo.rc
  
 RUN if [ "$SERVERNAME" = "localhost" ]; then \
-         less /etc/gavo.rc &&\
          sed -i "/serverURL/c\serverURL:" /etc/gavo.rc &&\
-         echo "############################ WARNING gavo.rc overwrite -- use localhost for dev only ###############################" \
-         less /etc/gavo.rc \ 
+         echo "############################ WARNING gavo.rc overwrite -- use localhost for dev only ###############################"\
     ; else \
-         less /etc/gavo.rc &&\
          sed -i "/serverURL/c\serverURL:${PROTOCOL}://${SERVERNAME}.${DOMAIN}:${DACHS_PORT}" /etc/gavo.rc &&\
-         echo "Warning : gavo.rc overwritten by .env servername, domain, protocol and port values" &&\
-         less /etc/gavo.rc \
+         echo "Warning : gavo.rc overwritten by .env servername, domain, protocol and port values" \
     ; fi
-    
+RUN echo "adapted gavo.rc" && less /etc/gavo.rc    
  
 ###
 #dachs configuration
@@ -103,7 +99,7 @@ RUN if [ &quot;$SERVERNAME&quot; = &quot;localhost&quot; ]; then \
 RUN chown dachsroot:gavo /var/gavo/etc/defaultmeta.txt
 RUN chown dachsroot:gavo /var/gavo/web/nv_static/img/logo*
 RUN chown -R dachsroot:gavo /var/gavo/inputs/*
-RUN chown -R dachsroot:gavo /var/gavo/logs
+
  
  
 ###
@@ -4,6 +4,7 @@
 service ssh restart
 service postgresql restart
  
+chown -R dachsroot:gavo /var/gavo/logs
 /usr/bin/perl /usr/lib/cgi-bin/awstats.pl -config=dachs -update
  
 for rep in $(find /var/gavo/inputs/[0-9a-zA-Z]* -maxdepth 0 -type d | cut -f5 -d'/')