Merge branch 'master' of ssh://github.com/CSCfi/Kielipankki-palvelut …

…into smsxml

servers/sanat/pouta

@@ -0,0 +1,2 @@
+[sanat]
+vm0623.kaj.pouta.csc.fi webdomain=vm0623.kaj.pouta.csc.fi ansible_user=cloud-user

servers/sanat/site.yml

@@ -14,16 +14,16 @@
       tags: hhvm
     - role: geerlingguy.composer
     - role: geerlingguy.memcached
+    - role: apache_ssl
+      tags: apache
+    - role: geerlingguy.apache
+      tags: apache
     - role: mediawiki
       tags: mediawiki
     - role: smsxml
       tags: smsxml
     - role: selinux
     - role: geerlingguy.repo-epel
-    - role: apache_ssl
-      tags: apache
-    - role: geerlingguy.apache
-      tags: apache
     - role: firewall
       tags: firewall
 

servers/taito/production

@@ -2,4 +2,4 @@
 127.0.0.1  ansible_connection=local
 
 [taito]
-taito-login4.csc.fi ansible_user=ling install_prefix=/appl/ling/
+taito-login4.csc.fi ansible_user=ling install_prefix=/appl/ling/ shared_group=csc

servers/taito/roles/praat/README.md

@@ -0,0 +1,8 @@
+praat
+=====
+
+Installing praat, the barren version
+
+The makefile is modified to allow for dynamic linking.
+
+More information: http://www.praat.org

servers/taito/roles/praat/defaults/main.yml

@@ -0,0 +1,9 @@
+---
+# defaults
+
+package_name: praat
+release_url: https://github.com/praat/praat.git
+version: "{{ praat_version }}"
+compile_root: /tmp/{{ ansible_user_id }}/ansible
+compile_dir: "{{ compile_root }}/praat/{{ branch }}"
+install_dir: "{{ install_prefix }}/{{ package_name }}/{{ version }}"

servers/taito/roles/praat/tasks/main.yml

@@ -0,0 +1,60 @@
+---
+# tasks file for praat
+
+- name: compile_root directory exists with 0777 permission
+  become: no
+  file: path={{ compile_root }}
+    mode=0777
+    recurse=no
+    state=directory
+
+- name: Clone repo
+  git:
+    repo: "{{ release_url }}"
+    dest: "{{ compile_dir }}"
+    force: yes
+    depth: 1
+    version: "{{ branch }}"
+
+- name: Prepare barren compilation
+  copy:
+    remote_src: true
+    src:  "{{ compile_dir }}/makefiles/makefile.defs.linux.barren"
+    dest: "{{ compile_dir }}/makefile.defs"
+
+- name: Remove static linking (experimental)
+  lineinfile:
+    path: "{{ compile_dir }}/makefile.defs"
+    regexp: "^LIBS = -lm -lpthread( -static -static-libgcc -static-libstdc\\+\\+)?$"
+    line: "LIBS = -lm -lpthread"
+
+- name: Running make 
+  shell: bash --login -c "module load gcc/4.8.2 && make -j8 > MAKE.log"
+  args:
+    chdir: "{{ compile_dir }}"
+    #creates: MAKE.log
+
+- name: create install_dir subtree
+  become: no
+  file:
+    path: "{{ install_dir }}/{{ item }}"
+    mode: 0775
+    recurse: no
+    state: directory
+  with_items:
+    - bin
+
+- name: Copy praat to install_dir
+  copy:
+    remote_src: true
+    src: "{{ compile_dir }}/praat"
+    dest: "{{ install_dir }}/bin"
+    mode: 0755
+
+- name: Fix permissions (if shared group is set)
+  file:
+    path: "{{ install_dir }}"
+    group: "{{ shared_group }}"
+    mode: "g+rwX,o+rX"
+    recurse: yes
+  when: shared_group is defined

servers/taito/site.yml

@@ -7,13 +7,15 @@
    - hfst_version: 3.12.1
    - hfst_ospell_version: 0.4.5
    - finnish_parse_version: 1.0
+   - praat_version: 6.0.29
   become: no
   roles:
    - { role: hfst, tags: hfst }
    - { role: hfst-morphologies, tags: hfst-morphologies }
    - { role: hfst-ospell, tags: hfst-ospell }
    - { role: check-hfst, tags: check-hfst }
    - { role: finnish-parse, branch: master, tags: finnish-parse }
+   - { role: praat, branch: master, tags: praat }