Merge branch 'develop'

Author: proycon

roles/lamachine-core/defaults/main.yml

@@ -14,6 +14,7 @@ python_bin: "python3" #path to the global python3 interpreter, may be an absolut
 pip_bin: "pip3" #must correspond to the one belonging to the above python interpreter
 webserver: false
 webservertype: "nginx"
+root: false
 unix_group: "{{unix_user}}"
 web_user: "{{unix_user}}"
 web_group: "{{web_user}}"

roles/lamachine-core/tasks/macosx.yml

@@ -31,3 +31,4 @@
       become_user: root
       command: pip3 install virtualenv
       when: localenv_type == "virtualenv"
+      ignore_errors: yes

roles/lamachine-core/tasks/main.yml

@@ -274,7 +274,7 @@
             content: |
                      Defaults env_keep += "PYTHONPATH"
                      Defaults secure_path = {{global_prefix}}/bin:{{global_prefix}}/sbin:/sbin:/bin:/usr/sbin:/usr/bin
-          when: root and locality == "global"
+          when: locality == "global" and root
 
         - name: Enable activation script globally
           become: "{{lm_become}}"

roles/lamachine-core/tasks/webserver.yml

@@ -133,14 +133,30 @@
         file:
             path: "{{ lm_prefix }}/{{item}}"
             state: directory
-            owner: "{{unix_user}}"
+            owner: "{{web_group}}"
             group: "{{web_group}}"
             mode: u+rwx,g+rwsx,a+rx
         with_items:
             - "var/log/uwsgi"
             - "var/log/nginx"
             - "var/tmp"
 
+      - name: Recursively setting log/tmp permissions
+        become: "{{lm_become}}"
+        become_user: root
+        file:
+            path: "{{ lm_prefix }}/{{item}}"
+            state: directory
+            owner: "{{web_user}}"
+            group: "{{web_group}}"
+            mode: u+rwX,g+rwX,a+rX
+            recurse: yes
+        with_items:
+            - "var/log/uwsgi"
+            - "var/log/nginx"
+            - "var/tmp"
+        ignore_errors: yes
+
       - name: Create webserver data directory (writable)
         become: "{{lm_become}}"
         become_user: root

roles/languagemachines-python/templates/uwsgi/flat.ini

@@ -23,4 +23,4 @@ env = PATH={{lm_prefix}}/bin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 env = LD_LIBRARY_PATH={{lm_prefix}}/lib:/usr/local/lib:/usr/lib:/lib
 env = PYTHONPATH={{lm_prefix}}/etc/
 env = DJANGO_SETTINGS_MODULE=flat_settings
-attach-daemon = foliadocserve -d {{www_data_path}}/flat.docroot -l {{lm_prefix}}/var/log/foliadocserve/foliadocserve.log --git --expirationtime 120 -p 3030
+attach-daemon2 = cmd=foliadocserve -d {{www_data_path}}/flat.docroot -l {{lm_prefix}}/var/log/foliadocserve/foliadocserve.log --git --expirationtime 120 -p 3030,control=True

roles/tscan/templates/uwsgi/tscan.ini

@@ -22,7 +22,7 @@ manage-script-name = {% if webservertype == "nginx" %}true{% else %}false{% endi
 env = PATH={{lm_prefix}}/bin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 env = LD_LIBRARY_PATH={{lm_prefix}}/lib:{{lm_prefix}}/opt/Alpino/create_bin/extralibs/boost:{{lm_prefix}}/opt/Alpino/create_bin/extralibs:/usr/local/lib:/usr/lib:/lib
 env = ALPINO_HOME={{lm_prefix}}/opt/Alpino
-attach-daemon2 = cmd={{lm_prefix}}/src/tscan/startfrog.sh,control=True
-attach-daemon2 = cmd={{lm_prefix}}/src/tscan/startalpino.sh,control=True
-attach-daemon2 = cmd={{lm_prefix}}/src/tscan/startwopr02.sh,control=True
-attach-daemon2 = cmd={{lm_prefix}}/src/tscan/startwopr20.sh,control=True
+attach-daemon2 = cmd={{lm_prefix}}/src/tscan/webservice/startfrog.sh,control=True,chdir={{lm_prefix}}/src/tscan/webservice/
+attach-daemon2 = cmd={{lm_prefix}}/src/tscan/webservice/startalpino.sh,control=True,chdir={{lm_prefix}}/src/tscan/webservice/
+attach-daemon2 = cmd={{lm_prefix}}/src/tscan/webservice/startwopr02.sh,control=True,chdir={{lm_prefix}}/src/tscan/webservice/
+attach-daemon2 = cmd={{lm_prefix}}/src/tscan/webservice/startwopr20.sh,control=True,chdir={{lm_prefix}}/src/tscan/webservice/

roles/valkuil/tasks/main.yml

@@ -63,6 +63,29 @@
         group: "{{unix_group}}"
       when: webservertype == "nginx" and ("all" in services or "valkuil"  in services)
 
+    - name: Creating run directory
+      become: "{{lm_become}}"
+      become_user: root
+      file:
+        path: "{{ lm_prefix }}/src/valkuil-gecco/run"
+          state: directory
+          owner: "{{web_user}}"
+          group: "{{web_group}}"
+          mode: u+rwX,g+rwsX,a+rX
+      ignore_errors: yes
+
+    - name: Recursively setting run permissions
+      become: "{{lm_become}}"
+      become_user: root
+      file:
+        path: "{{ lm_prefix }}/src/valkuil-gecco/run"
+          state: directory
+          owner: "{{web_user}}"
+          group: "{{web_group}}"
+          mode: u+rwX,g+rwX,a+rX
+          recurse: yes
+      ignore_errors: yes
+
     - name: "Install uwsgi configurations"
       become: "{{lm_become}}"
       become_user: root

roles/valkuil/templates/uwsgi/valkuil.ini

@@ -20,5 +20,5 @@ manage-script-name = {% if webservertype == "nginx" %}true{% else %}false{% endi
 
 env = PATH={{lm_prefix}}/bin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 env = LD_LIBRARY_PATH={{lm_prefix}}/lib:/usr/local/lib:/usr/lib:/lib
-attach-daemon2 = cmd=gecco {{lm_prefix}}/src/valkuil-gecco/valkuil.yml startservers
+attach-daemon2 = cmd=gecco {{lm_prefix}}/src/valkuil-gecco/valkuil.yml startservers --blocking,control=True