dachs logs volumes binded for awstats

Chloé Azria
1 parent a68aedba
Showing 11 changed files with 51 additions and 221 deletions Show diff stats
README
.env -> conf/.env
000-default.conf -> conf/000-default.conf
awstats.dachs.conf -> conf/awstats.dachs.conf
dachs-dockerfile -> conf/dachs-dockerfile
docker-compose.yml -> conf/docker-compose.yml
docker-entrypoint.sh -> conf/docker-entrypoint.sh
logos/logo_big.png -> conf/logos/logo_big.png
logos/logo_medium.png -> conf/logos/logo_medium.png
myconf.conf
ports.conf
@@ -1,181 +0,0 @@
-# les choses à configurer pour son instance gavo.rc car il y a l'ip du serveur ou son nom dns
-# le nom du dépot correspnd au nom du projet/nom du serveur, ici /vespa/voparis-tap-planeto/
-
-#Configuration du docker mydachs une fois lancé
-apt-get update
-apt-get upgrade
-apt-get install apache2
-apt-get install awstats
-apt-get install geoip-database
-apt-get install libgeo-ipfree-perl
-apt-get install git
-apt-get install wget
-
-cd /home/dachsroot/
-git clone https://gitlab.obspm.fr/vespa/dachs/servers/padc/voparis-tap-planeto.git
-$chemin=/home/dachsroot/nom_du_serveur/
-
-# sous root configuration du serveur
-cp chemin/conf/000-default.conf /etc/apache2/sites-enabled/000-default.conf
-service apache2 restart
-# restart d'apache pour éviter le conflit de port, apache sera sur le port 8080
-
-cp chemin/conf/awstats.dachs.conf /etc/awstats/awstats.dachs.conf
-a2enmod cgi
-service apache2 restart
-
-cp chemin/conf/gavo.rc /etc/gavo.rc
-cp chemin/conf/defaultmeta.txt 
-chown dachsroot:gavo /var/gavo/etc/defaultmeta.txt
-cp chemin/conf/logo* /var/gavo/web/nv_static/img/
-chown dachsroot:gavo /var/gavo/web/nv_static/img/logo*
-
-
-
-# sous root configuration des services
-cp -r chemin/services/ /var/gavo/inputs/
-chown -R dachsroot:gavo /var/gavo/inputs/*
-
-#ingestion des données et création des services
-#depuis chacun des sous répertoires de services
-$sous_rep = nom_sous_repertoire (ici planets seulement)
-
-# pour chaque service
-su -u dachsroot 'gavo imp /var/gavo/inputs/sous_rep/q.rd
-su -u dachsroot 'gavo pub //services'
-su -u dachsroot 'gavo pub //tap'
-su -u dachsroot 'gavo pub /var/gavo/inputs/sous_rep/q.rd'
-gavo serve restart
-
-
-## mettre en cron.daily un fichier en 777 avec
-  #!/bin/bash
-  /usr/bin/perl /usr/lib/cgi-bin/awstats.pl -config=dachs -update
-
-
-
-## truc à penser
-FROM debian:latest
-RUN apt-get -y update 
-RUN apt-get -y install awstats
-RUN apt-get -y install apache2
-EXPOSE 80
-
-
-
-###########################
-#help.mdwn :
-###########################
-#source
-https://docs.docker.com/compose/compose-file/
-
-# packet docker necessaire sur le serveur (deb 10)
-sudo apt install docker docker.io wmdocker
-
-# commande nettoyage pour test
-docker stop dachs-voparis && docker rm dachs-voparis && docker image rm dachs-voparis:latest && docker system prune
-
-#fonctionnement du docker
-dans l'ordre
-.env => définis les variables utilisé dans docker-compose.yml
-docker-compose.yml => définis les dockers et les params de build des bulles
-dachs-dockerfile => définis les lignes de commandes pour build dachs
-docker-entrypoint.sh => script executé au démarrage du docker
-secrets / id_rsa-phamy.prive ==> Ne JAMAIS mettre dans un git !!!
-
-docker-compose up -d ==> lance la séquence, --build pour forcer la maj
-
-docker image list => list les images
-docker ps -a => list les dockers
-docker image rm rep_dachs pour supprimer l'image docker
-docker rm dachs pour supprimer le docker
-
-# link de docker
-si besoin de séparer awstat
-Ne pas utiliser link "depreciate"
-
-version: "3"
-services:
-
-  proxy:
-    build: ./proxy
-    networks:
-      - frontend
-  app:
-    build: ./app
-    networks:
-      - frontend
-      - backend
-  db:
-    image: postgres
-    networks:
-      - backend
-
-networks:
-  frontend:
-    # Use a custom driver
-    driver: custom-driver-1
-  backend:
-    # Use a custom driver which takes special options
-    driver: custom-driver-2
-    driver_opts:
-      foo: "1"
-      bar: "2"
-
-# volume data
-ajouter dans le yaml docker-compose
-version: "3"
-services:
-
-  db:
-    image: postgres:13
-    volumes:
-      - db-data:/var/lib/postgresql/data
-    networks:
-      - backend
-
-networks:
-  frontend:
-
-volumes:
-  db-data:
-
-# passage de variable dans un docker-compose
-Beside your docker-compose.yml file, create a new text file called .env. In it, add the following:
-cat .env
-CLIENT_ID=yourclientid
-CLIENT_SECRET=yourclientsecret
-
-Now, open your docker-compose.yml file again, and replace yourclientid with ${CLIENT_ID} and yourclientsecret with ${CLIENT_SECRET}. That is:
-
-services:
-  app:
-    . . . #snipped
-    environment:
-	  - GITHUB_CLIENT_ID=${CLIENT_ID}
-	  - GITHUB_CLIENT_SECRET=${CLIENT_SECRET}
-
-# comment passer des mots des passes
-version: "3.7"
-services:
-
-  dachs:
-    container_name: dachs-voparis
-    image: dachs-voparis
-    build:
-      dockerfile: dachs-dockerfile
-    secrets:
-      - id_rsa
-
-secrets:
-  id_rsa:
-    file: id_rsa-phamy.prive
-
-pour chaque docker dont le secrets id_rsa sera défini, le fichier sera copie dans le docker dans /run/secrets/id_rsa
-root@c459f2b03173:~# ls -tralh /run/secrets/      
-total 16K
--rw-r--r-- 1 dachsroot gavo  739 Nov 24 08:43 id_rsa
---> sans docker swarm les droits sont ceux de l'hote !
-
-
-
@@ -13,8 +13,10 @@ APACHE_PORT=8081
 #default 8080
 SERVERNAME=localhost
 #name of the host machine - default to localhost, for dev
-#DOMAIN=``
+DOMAIN=
 #default to ""
+PROTOCOL=http
+#default to http
 #note the default ports inside the container will be binded to DACHS_PORT and AWSTATS_PORT of the host machine
@@ -50,7 +50,6 @@
 #
 LogFile="/usr/share/awstats/tools/logresolvemerge.pl /var/gavo/logs/web.log* |"
-
 # Enter the log file type you want to analyze.
 # Possible values:
 #  W - For a web log file
@@ -9,6 +9,9 @@ ARG HOMEPATH=/home/dachsroot
 ARG DACHS_PORT
 ARG APACHE_PORT
 ARG SERVERNAME
+ARG DOMAIN
+ARG PROTOCOL
+
 RUN apt-get -y update
@@ -26,7 +29,7 @@ RUN echo &quot;deb http://vo.ari.uni-heidelberg.de/debian release main&quot; &gt; /etc/apt/so
 RUN apt-get -y update
 RUN apt-get -y upgrade
 RUN apt-get install -y postgresql-13 postgresql-13-q3c postgresql-13-pgsphere 
-RUN apt-get install -y git wget awstats net-tools vim
+RUN apt-get install -y git wget awstats net-tools vim libgeo-ipfree-perl
 RUN service postgresql restart && apt-get install -y gavodachs2-server
 RUN apt-get install -y openssh-server openssh-client apache2 w3m 
@@ -35,7 +38,7 @@ RUN apt-get install -y openssh-server openssh-client apache2 w3m
 COPY . $HOMEPATH
 #import dachs server configuration files from git
-RUN echo $GITURL/vespa/dachs/servers/$GITREPO_INSTITUTION/$GITREPO_SERVER.git
+RUN echo cloning from $GITURL/vespa/dachs/servers/$GITREPO_INSTITUTION/$GITREPO_SERVER.git
 RUN git clone $GITURL/vespa/dachs/servers/$GITREPO_INSTITUTION/$GITREPO_SERVER.git $HOMEPATH/server
@@ -58,24 +61,44 @@ RUN mkdir $HOMEPATH/services/ &amp;&amp; cd $HOMEPATH/services/ &amp;&amp; egrep -o &#39;https://[^&quot;
 RUN cp -r $HOMEPATH/services/* /var/gavo/inputs/
 #extract parameters values from gavo.rc
+######
+#replace infos into 000default.conf, awstats.dachs.conf, ports.conf
+######
+##Adapt 000-default.conf ports and maintainer (taken from gavo.rc)
 RUN export maintainerAddress=`grep "^maintainerAddress:" /etc/gavo.rc | cut -d ":" -f 2` && sed -i "s/webmaster@localhost/${maintainerAddress}/g" /etc/apache2/sites-enabled/000-default.conf && less /etc/apache2/sites-enabled/000-default.conf
-RUN sed -i "s/80/${APACHE_PORT}/g" /etc/apache2/ports.conf
 RUN sed -i "s/8080/${APACHE_PORT}/g" /etc/apache2/sites-enabled/000-default.conf
-RUN sed -i "/serverPort/c\serverPort:${DACHS_PORT}"  /etc/gavo.rc
-RUN sed -i "/serverURL/c\serverURL:${SERVERNAME}" /etc/gavo.rc
-#replace infos into 000default.conf, awstats.dachs.conf, ports.conf
-#RUN sed -i "s/webmaster@localhost/${maintainerAddress}/g" /etc/apache2/sites-enabled/000-default.conf
+##Adapt ports.conf with APACHE PORT
+RUN sed -i "s/80/${APACHE_PORT}/g" /etc/apache2/ports.conf
+##Adapt awstats.dachs.conf with server address and domain
+RUN if [ "$SERVERNAME" = "localhost" ]; then \
+	sed -i "s/mydomain/localhost/g" /etc/awstats/awstats.dachs.conf && sed -i "s/myserver.mydomain/localhost/g" /etc/awstats/awstats.dachs.conf \
+    ;else \
+	sed -i "s/mydomain/${DOMAIN}/g" /etc/awstats/awstats.dachs.conf && sed -i "s/myserver/${SERVERNAME}/g" /etc/awstats/awstats.dachs.conf \
+    ;fi
+
+##Adapt gavo.rc with ports and server name
+
+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 \
+         sed -i "/serverURL/c\serverURL:" /etc/gavo.rc &&\
+         echo "############################ WARNING gavo.rc overwrite -- localhost for dev only ###############################" \  
+    ; else \
+         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" \
+    ; fi
 ###
 #dachs configuration
 ###
-
 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
 ###
@@ -88,9 +111,9 @@ RUN a2enmod cgi
 ###
 # auto update awstats data using cron
 ###
-
+RUN mkdir -p ${HOMEPATH}/dachslogs
 RUN echo "#!/bin/bash" > /etc/cron.daily/awstats
-RUN echo "/usr/bin/perl /usr/lib/cgi-bin/awstats.pl -config=dachs -update" >> /etc/cron.daily/awstats
+RUN echo "/usr/bin/perl /usr/lib/cgi-bin/awstats.pl -config=dachs -update" >> /etc/cron.daily/awstats 
 RUN chgrp 755 /etc/cron.daily/awstats
@@ -19,15 +19,20 @@ services:
       dockerfile: dachs-dockerfile
       args:   
         - "VERSION=${VERSION}"
+        - "GITREPO_SERVER=${GITREPO_SERVER}"        
         - "GITREPO_INSTITUTION=${GITREPO_INSTITUTION}"
-        - "GITREPO_SERVER=${GITREPO_SERVER}"
         - "DACHS_PORT=${DACHS_PORT}"
         - "APACHE_PORT=${APACHE_PORT}"
         - "SERVERNAME=${SERVERNAME}"
-
-### example if you need to mount volumes (e.g if your service needs to parse files or if you want to upload it through dachs)
-#    volumes:
-#      - ./data:/home/dachsroot/data
- 
+        - "DOMAIN=${DOMAIN}"
+        - "PROTOCOL=${PROTOCOL}"
+    volumes:
+      #- ../apache/cgi-bin:/home/dachsroot/apache/cgi-bin
+      - ../apache/logapache:/var/log/apache2
+      - ../apache/dachslogs:/var/gavo/logs
+      
+      # example if you need to mount volumes (e.g if your service needs to parse files or if you want to upload it through dachs)
+      #- paht/to/data:/var/gavo/inputs/service/data
+      
 ### To uncomment for production :
 #    restart: always
@@ -4,6 +4,8 @@
 service ssh restart
 service postgresql restart
+/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'/')
 do
   su - dachsroot bash -c "dachs imp ${rep}/q.rd"
@@ -11,10 +13,10 @@ do
   su - dachsroot bash -c "dachs pub //tap"
   su - dachsroot bash -c "dachs pub ${rep}/q.rd"
 done
-dachs serve restart
-
+service dachs restart
 service apache2 restart
+
 #block a tester pour l'accès aux depots privé
 #fonctionne avec la clé privé ssh (secrets dans docker compose)
 eval "$(ssh-agent -s)"
@@ -1,4 +0,0 @@
-my_servername=voparis-test
-my_domain=obspm.fr
-maintainer_email=vo.paris@obspm.fr
-authority_ivoid="ivo://vopdc.obspm"
@@ -1,16 +0,0 @@
-# If you just change the port or add more ports here, you will likely also
-# have to change the VirtualHost statement in
-# /etc/apache2/sites-enabled/000-default.conf
-
-Listen 8080
-
-<IfModule ssl_module>
-	Listen 443
-</IfModule>
-
-<IfModule mod_gnutls.c>
-	Listen 443
-</IfModule>
-
-# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
-