Merge branch 'develop' into master

Author: proycon

bootstrap.sh

@@ -1417,9 +1417,12 @@ maintainer_mail: \"$USERNAME@$HOSTNAME\" #Enter your e-mail address here
     echo "force_https: no #Should be enabled when behind a reverse proxy that handles https for you, ensures all internal links are https" >> $STAGEDCONFIG
 echo "mapped_http_port: $HOSTPORT #mapped webserver port on host system (for VM/docker only)
 services: [ $SERVICES ]  #List of services to provide, if set to [ all ], all possible services from the software categories you install will be provided. You can remove this and list specific services you want to enable. This is especially needed in case of a LaMachine installation that intends to only provide a single service.
-webservertype: nginx #If set to anything different, the internal webserver will not be enabled/provided by LaMachine (which allows you to run your own external one), do leave webserver: true set as is though.
-clam_include: \"\" #You can set this to a CLAM base configuration file that will be included from all the webservices, it allows you to do configure common traits like authentication
-" >> $STAGEDCONFIG
+webservertype: nginx #If set to anything different, the internal webserver will not be enabled/provided by LaMachine (which allows you to run your own external one), do leave webserver: true set as is though." >> $STAGEDCONFIG
+if [[ $FLAVOUR == "vagrant" ]] || [[ $FLAVOUR == "docker" ]] || [[ $FLAVOUR == "singularity" ]] || [[ $FLAVOUR == "lxc" ]] || [[ $FLAVOUR == "remote" ]]; then
+    echo "clam_include: \"/usr/local/etc/base.config.yml\" #You can set this to a CLAM base configuration file that will be included from all the webservices, it allows you to do configure common traits like authentication" >> $STAGEDCONFIG
+else
+    echo "clam_include: \"$BASEDIR/$LM_NAME/etc/base.config.yml\" #You can set this to a CLAM base configuration file that will be included from all the webservices, it allows you to do configure common traits like authentication" >> $STAGEDCONFIG
+fi
 if [[ $OS == "mac" ]] || [[ "$FLAVOUR" == "remote" ]]; then
     echo "lab: false #Enable Jupyter Lab environment, note that this opens the system to arbitrary code execution and file system access! (provided the below password is known)" >> $STAGEDCONFIG
 else

roles/alpino/templates/clam/alpino.config.yml

@@ -5,4 +5,3 @@ port: 8805
 urlprefix: "alpino"
 root: "{{www_data_path}}/alpino.clam/"
 bindir: "{{lm_prefix}}/bin/"
-flaturl: "{% if http_port|int == 443 %}https://{% else %}http://{% endif %}{{hostname}}{% if http_port != 80 and http_port != 443 %}:{{http_port}}{% endif %}/flat"

roles/lamachine-core/tasks/webserver.yml

@@ -401,6 +401,13 @@
       state: link
     when: root and locality == "global"
 
+  - name: Adding base configuration for CLAM
+    become: "{{lm_become}}"
+    become_user: root
+    template:
+      src: "clam_base.config.yml"
+      dest: "{{lm_prefix}}/etc/clam_base.config.yml"
+
   - name: Installing lamastats for analytics
     include_role:
       name: lamachine-python-install

roles/lamachine-core/templates/clam_base.config.yml

@@ -0,0 +1,4 @@
+README: "DO NOT EDIT THIS FILE, IT WILL BE OVERWRITTEN ON LAMACHINE UPDATE! Create your own base.config.yml instead and change clam_include in your LaMachine configuration"
+{% if webserver and ("flat" in services or "all" in services) %}
+flaturl: "{% if http_port|int == 443 %}https://{% else %}http://{% endif %}{{hostname}}{% if http_port != 80 and http_port != 443 %}:{{http_port}}{% endif %}/flat"
+{% endif %}

roles/languagemachines-python/templates/clam/frog.config.yml

@@ -5,4 +5,3 @@ port: 8801
 urlprefix: "frog"
 root: "{{www_data_path}}/frog.clam/"
 bindir: "{{lm_prefix}}/bin/"
-flaturl: "{% if http_port|int == 443 %}https://{% else %}http://{% endif %}{{hostname}}{% if http_port != 80 and http_port != 443 %}:{{http_port}}{% endif %}/flat"

roles/piccl/templates/clam/piccl.config.yml

@@ -4,6 +4,5 @@ include: "{{clam_include}}"
 port: 8806
 urlprefix: "piccl"
 root: "{{www_data_path}}/piccl.clam/"
-flaturl: "{% if http_port|int == 443 %}https://{% else %}http://{% endif %}{{hostname}}{% if http_port != 80 and http_port != 443 %}:{{http_port}}{% endif %}/flat"
 piccldir: "{{lm_prefix}}/opt/PICCL"
 piccldataroot: "{{lm_prefix}}/opt/PICCL"

roles/spacy/templates/clam/spacy.config.yml

@@ -5,4 +5,3 @@ port: 8818
 urlprefix: "spacy"
 root: "{{www_data_path}}/spacy.clam/"
 bindir: "{{lm_prefix}}/bin/"
-flaturl: "{% if http_port|int == 443 %}https://{% else %}http://{% endif %}{{hostname}}{% if http_port != 80 and http_port != 443 %}:{{http_port}}{% endif %}/flat"

roles/tscan/templates/clam/tscan.config.yml

@@ -6,4 +6,3 @@ urlprefix: "tscan"
 root: "{{www_data_path}}/tscan.clam/"
 bindir: "{{lm_prefix}}/bin/"
 tscandir: "{{lm_prefix}}/src/tscan"
-flaturl: "{% if http_port|int == 443 %}https://{% else %}http://{% endif %}{{hostname}}{% if http_port != 80 and http_port != 443 %}:{{http_port}}{% endif %}/flat"

roles/valkuil/templates/clam/valkuil.config.yml

@@ -4,5 +4,4 @@ include: "{{clam_include}}"
 port: 8813
 urlprefix: "valkuil"
 root: "{{www_data_path}}/valkuil.clam/"
-flaturl: "{% if http_port|int == 443 %}https://{% else %}http://{% endif %}{{hostname}}{% if http_port != 80 and http_port != 443 %}:{{http_port}}{% endif %}/flat"
 valkuildir: "{{lm_prefix}}/src/valkuil-gecco"