Update to stable/1.7.x

playbooks/archivematica-centos7/README.md

@@ -57,5 +57,12 @@ Deploy](docs/digital-ocean-install-example.rst) document.
 
 6. The ansible playbook `singlenode.yml` specified in the Vagrantfile will provision using the branches of archivematica specfied in the file `vars-singlenode.yml`. Edit this file if need to deploy other branches.  
 
+7. If you get errors regarding the Vagrant shared folders, they are usually due
+to different versions of VirtualBox. One way to fix it is using a Vagrant
+plugin that installs the host's VirtualBox Guest Additions on the guest system:
+  ```
+  $ vagrant plugin install vagrant-vbguest
+  $ vagrant vbguest
+  ```
 
 For more archivematica development information, see: https://wiki.archivematica.org/Getting_started

playbooks/archivematica-centos7/Vagrantfile

@@ -8,7 +8,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # note the official centos box doesn't have guest additions
   # using geerlingguy box instead ( to have synced folders ) 
-  config.vm.box = ENV.fetch("VAGRANT_BOX", "geerlingguy/centos7")
+  config.vm.box = ENV.fetch("VAGRANT_BOX", "centos/7")
 
   {
     "am-local-centos7" => {
@@ -32,7 +32,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   end
 
   # Make the project root available to the guest VM
-  config.vm.synced_folder '.', '/vagrant'
+  config.vm.synced_folder '.', '/vagrant', mount_options: ["uid=333", "gid=333"]
 
   # Ansible provisioning
   config.vm.provision :ansible do |ansible|

playbooks/archivematica-centos7/requirements.yml

@@ -12,7 +12,6 @@
   version: "master"
   name: "artefactual.clamav"
 
-- src: "https://github.com/artefactual-labs/ansible-role-archivematica-src"
-  version: "stable/1.6.x"
+- src: "https://github.com/artefactual-labs/ansible-archivematica-src"
+  version: "qa/1.7.x"
   name: "artefactual.archivematica-src"
-

playbooks/archivematica-centos7/singlenode.yml

@@ -7,12 +7,41 @@
       tags:
         - "always"
 
-    - name: "Set SELinux to Permissive"
-      command: "setenforce Permissive"      
-      become: "yes"
+   - name: "SELinux: Allow nginx connections to Gunicorn"
+     become: "yes"
+     seboolean:
+       name: "httpd_can_network_connect"
+       state: "yes"
+       persistent: "yes"
+     when: ansible_selinux.status == "enabled"
 
-    - name: "Enable epel repository"
-      yum:
+   - name: "SELinux: Allow nginx to connect to MySQL"
+     become: "yes"
+     seboolean:
+       name: "httpd_can_network_connect_db"
+       state: "yes"
+       persistent: "yes"
+     when: ansible_selinux.status == "enabled"
+
+   - name: "SELinux: Allow nginx to change system limits"
+     become: "yes"
+     seboolean:
+       name: "httpd_setrlimit"
+       state: "yes"
+       persistent: "yes"
+     when: ansible_selinux.status == "enabled"
+
+   - name: "SELinux: Allow nginx to use ports 8000 and 8001"
+     become: "yes"
+     seport:
+       ports: "8000,8001"
+       proto: "tcp"
+       setype: "http_port_t"
+       state: "present"
+     when: ansible_selinux.status == "enabled"
+
+   - name: "Enable EPEL repository"
+     yum:
         name: "epel-release"
         state: "latest"
       become: "yes"
@@ -55,7 +84,8 @@
           bootstrap.mlockall: true,
           discovery.zen.ping.multicast.enabled: false,
           http.max_content_length: 1024mb 
-          }
+          },
+        when: "archivematica_src_search_enabled|bool",
       }
     - { role: "artefactual.clamav", tags: ["clamav"], become: "yes" }
     - { role: "jdauphant.nginx", tags: ["nginx"], become: "yes" }

playbooks/archivematica-centos7/vars-singlenode.yml

@@ -3,8 +3,8 @@
 # archivematica-src role
 
 archivematica_src_install_devtools: "no"
-archivematica_src_am_version: "stable/1.6.x"
-archivematica_src_ss_version: "stable/0.10.x"
+archivematica_src_am_version: "stable/1.7.x"
+archivematica_src_ss_version: "stable/0.11.x"
 archivematica_src_ss_gunicorn: "true"
 archivematica_src_am_dashboard_gunicorn: "true"
 archivematica_src_am_multi_venvs: "yes"

playbooks/archivematica-xenial/README.md

@@ -54,5 +54,12 @@ machine.
 
 6. The ansible playbook `singlenode.yml` specified in the Vagrantfile will provision using qa branches of archivematica. To provision using the stable 1.5.x/0.8.x branches, replace "vars-singlenode-qa.yml" with "vars-singlenode-1.5.yml" in `singlenode.yml`. You can also modify create a custom vars file and pass it instead (to modify role variables to deploy custom branches, etc.)  
 
+7. If you get errors regarding the Vagrant shared folders, they are usually due
+to different versions of VirtualBox. One way to fix it is using a vagrant
+plugin that installs the host's VirtualBox Guest Additions on the guest system:
+  ```
+  $ vagrant plugin install vagrant-vbguest
+  $ vagrant vbguest
+  ```
 
 For more archivematica development information, see: https://wiki.archivematica.org/Getting_started

playbooks/archivematica-xenial/Vagrantfile

@@ -31,7 +31,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   end
 
   # Make the project root available to the guest VM
-  config.vm.synced_folder '.', '/vagrant'
+  config.vm.synced_folder '.', '/vagrant', mount_options: ["uid=333", "gid=333"]
 
   # Ansible provisioning
   config.vm.provision "shell", inline: "sudo apt-get install -y python"

playbooks/archivematica-xenial/requirements.yml

@@ -17,7 +17,7 @@
   name: "artefactual.nginx"
 
 - src: "https://github.com/artefactual-labs/ansible-archivematica-src"
-  version: "stable/1.6.x"
+  version: "qa/1.7.x"
   name: "artefactual.archivematica-src"
 
 - src: "https://github.com/artefactual-labs/ansible-clamav"

playbooks/archivematica-xenial/singlenode.yml

@@ -3,7 +3,7 @@
 
   pre_tasks:
 
-    - include_vars: "vars-singlenode-1.6.yml"
+    - include_vars: "vars-singlenode-1.7.yml"
       tags:
         - "always"
 
@@ -21,6 +21,7 @@
       become: "yes"
       tags:
         - "elasticsearch"
+      when: "archivematica_src_search_enabled|bool"
 
     - role: "artefactual.percona"
       become: "yes"

playbooks/archivematica-xenial/vars-singlenode-1.7.yml

@@ -0,0 +1,33 @@
+---
+
+# archivematica-src role
+
+archivematica_src_install_devtools: "yes"
+archivematica_src_am_version: "stable/1.7.x"
+archivematica_src_ss_version: "stable/0.11.x"
+archivematica_src_ss_gunicorn: "true"
+archivematica_src_am_dashboard_gunicorn: "true"
+archivematica_src_am_multi_venvs: "true"
+archivematica_src_dir: "/opt/archivematica"
+
+# elasticsearch role
+
+elasticsearch_version: "1.7.6"
+elasticsearch_apt_java_package: "openjdk-8-jre-headless"
+elasticsearch_apt_repos: []
+elasticsearch_apt_dependencies: []
+elasticsearch_java_home: "/usr/lib/jvm/java-8-openjdk-amd64"
+elasticsearch_heap_size: "640m"
+elasticsearch_max_open_files: "65535"
+elasticsearch_node_max_local_storage_nodes: "1"
+elasticsearch_index_mapper_dynamic: "true"
+elasticsearch_memory_bootstrap_mlockall: "true"
+elasticsearch_install_java: "true"
+elasticsearch_thread_pools:
+  - "threadpool.bulk.type: fixed"
+  - "threadpool.bulk.size: 50"
+  - "threadpool.bulk.queue_size: 1000"
+
+# percona role
+
+mysql_root_password: "ChangeMe!"

playbooks/archivematica/README.md

@@ -55,5 +55,10 @@ Deploy](docs/digital-ocean-install-example.rst) document.
 
 6. The ansible playbook `singlenode.yml` specified in the Vagrantfile will provision using stable branches of archivematica. To provision using the qa 1.x/0.x branches, replace "vars-singlenode-1.6.yml" with "vars-singlenode-qa.yml" in `singlenode.yml`. You can also modify create a custom vars file and pass it instead (to modify role variables to deploy custom branches, etc.)  
 
+7. If you get errors regarding the Vagrant shared folders, they are usually due to different versions of VirtualBox. One way to fix it is using a Vagrant plugin that installs the host's VirtualBox Guest Additions on the guest system:
+  ```
+  $ vagrant plugin install vagrant-vbguest
+  $ vagrant vbguest
+  ```
 
 For more archivematica development information, see: https://wiki.archivematica.org/Getting_started

playbooks/archivematica/Vagrantfile

@@ -31,7 +31,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   end
 
   # Make the project root available to the guest VM
-  config.vm.synced_folder '.', '/vagrant'
+  config.vm.synced_folder '.', '/vagrant', mount_options: ["uid=333", "gid=333"]
 
   # Ansible provisioning
   config.vm.provision :ansible do |ansible|

playbooks/archivematica/requirements.yml

@@ -17,7 +17,7 @@
   name: "artefactual.nginx"
 
 - src: "https://github.com/artefactual-labs/ansible-archivematica-src"
-  version: "stable/1.6.x"
+  version: "qa/1.7.x"
   name: "artefactual.archivematica-src"
 
 - src: "https://github.com/artefactual-labs/ansible-clamav"

playbooks/archivematica/singlenode.yml

@@ -3,7 +3,7 @@
 
   pre_tasks:
 
-    - include_vars: "vars-singlenode-1.6.yml"
+    - include_vars: "vars-singlenode-1.7.yml"
       tags:
         - "always"
 
@@ -21,6 +21,7 @@
       become: "yes"
       tags:
         - "elasticsearch"
+      when: "archivematica_src_search_enabled|bool"
 
     - role: "artefactual.percona"
       become: "yes"

playbooks/archivematica/vars-singlenode-1.7.yml

@@ -0,0 +1,34 @@
+---
+
+# archivematica-src role
+
+archivematica_src_install_devtools: "yes"
+archivematica_src_am_version: "stable/1.7.x"
+archivematica_src_ss_version: "stable/0.11.x"
+archivematica_src_ss_gunicorn: "true"
+archivematica_src_am_dashboard_gunicorn: "true"
+archivematica_src_am_multi_venvs: "true"
+archivematica_src_dir: "/opt/archivematica"
+archivematica_src_search_enabled: "yes"
+
+# elasticsearch role
+
+elasticsearch_version: "1.7.6"
+elasticsearch_apt_java_package: "openjdk-7-jre-headless"
+elasticsearch_apt_repos: []
+elasticsearch_apt_dependencies: []
+elasticsearch_java_home: "/usr/lib/jvm/java-7-openjdk-amd64"
+elasticsearch_heap_size: "640m"
+elasticsearch_max_open_files: "65535"
+elasticsearch_node_max_local_storage_nodes: "1"
+elasticsearch_index_mapper_dynamic: "true"
+elasticsearch_memory_bootstrap_mlockall: "true"
+elasticsearch_install_java: "true"
+elasticsearch_thread_pools:
+  - "threadpool.bulk.type: fixed"
+  - "threadpool.bulk.size: 50"
+  - "threadpool.bulk.queue_size: 1000"
+
+# percona role
+
+mysql_root_password: "ChangeMe!"