diff --git a/group_vars/friends_of_pul/production.yml b/group_vars/friends_of_pul/production.yml index ea9c1fdb75..56a19e3481 100644 --- a/group_vars/friends_of_pul/production.yml +++ b/group_vars/friends_of_pul/production.yml @@ -9,6 +9,8 @@ mysql_root_password: "{{ vault_mysql_root_password }}" mysql_server: false +nfs_host_server: "lib-fs-prod.princeton.edu" + mysql_databases: - name: "{{ drupal_db_name }}" encoding: utf8mb4 diff --git a/group_vars/friends_of_pul/staging.yml b/group_vars/friends_of_pul/staging.yml index 181a37b130..8e854d7f1b 100644 --- a/group_vars/friends_of_pul/staging.yml +++ b/group_vars/friends_of_pul/staging.yml @@ -18,6 +18,8 @@ install_ruby_from_source: true ruby_version_override: "ruby-3.1.3" bundler_version: "2.3.18" +nfs_host_server: "lib-fs-staging.princeton.edu" + mysql_server: false mysql_databases: diff --git a/inventory/all_projects/friends_of_pul b/inventory/all_projects/friends_of_pul index bb1a990b29..cb49e03e2b 100644 --- a/inventory/all_projects/friends_of_pul +++ b/inventory/all_projects/friends_of_pul @@ -2,3 +2,4 @@ fpul-prod1.princeton.edu [friends_of_pul_staging] fpul-staging1.princeton.edu +fpul-staging2.princeton.edu diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 7b59979ba6..6939eee655 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -56,7 +56,7 @@ - name: common | install dust ansible.builtin.apt: - deb: "{{ dust_url }}/v{{ dust_version }}/du-dust_{{ dust_version }}_amd64.deb" + deb: "{{ dust_url }}/v{{ dust_version }}/du-dust_{{ dust_version }}-1_amd64.deb" when: running_on_server - name: common | install fdfind diff --git a/roles/friends_of_pul/handlers/main.yml b/roles/friends_of_pul/handlers/main.yml index b9616c9396..aa6a50676d 100644 --- a/roles/friends_of_pul/handlers/main.yml +++ b/roles/friends_of_pul/handlers/main.yml @@ -1,2 +1,6 @@ --- # handlers file for roles/friends_of_pul +- name: restart idmapd + ansible.builtin.service: + name: idmapd + state: restart diff --git a/roles/friends_of_pul/tasks/main.yml b/roles/friends_of_pul/tasks/main.yml index aadb4b9fba..405b59afc1 100644 --- a/roles/friends_of_pul/tasks/main.yml +++ b/roles/friends_of_pul/tasks/main.yml @@ -1,5 +1,20 @@ --- # tasks file for roles/friends_of_pul + +- name: friends_of_pul | enable id_mapping + ansible.builtin.lineinfile: + path: /etc/default/nfs-common + regexp: '^NEED_IDMAPD=' + line: NEED_IDMAPD=yes + notify: restart idmapd + +- name: friends_of_pul | add fqdn for idmapping + ansible.builtin.lineinfile: + path: /etc/idmapd.conf + insertbefore: '# Domain = localdomain' + line: "Domain = {{ nfs_host_server }}" + state: present + - name: friends_of_pul | Create drupal7 directory production ansible.posix.mount: src: "{{ nfs_server_production }}:/var/nfs/drupal7"