diff options
| -rw-r--r-- | roles/gathio/defaults/main.yml | 3 | ||||
| -rw-r--r-- | roles/gathio/tasks/main.yml | 3 | ||||
| -rw-r--r-- | roles/gathio/templates/var/lib/gathio/gathio/config/domain.js.j2 | 4 | ||||
| -rw-r--r-- | roles/gathio/vars/main.yml | 8 |
4 files changed, 13 insertions, 5 deletions
diff --git a/roles/gathio/defaults/main.yml b/roles/gathio/defaults/main.yml index 817e2e3..5a6aa8c 100644 --- a/roles/gathio/defaults/main.yml +++ b/roles/gathio/defaults/main.yml @@ -2,4 +2,5 @@ gathio_version: master gathio_user: gathio gathio_port: 8080 gathio_from_address: 'events-noreply@{{ email_domain }}' -gathio_domain: '{{ ansible_fqdn }}:{{ gathio_port }}' +gathio_server_name: '{{ ansible_fqdn }}' +gathio_site_name: gathio diff --git a/roles/gathio/tasks/main.yml b/roles/gathio/tasks/main.yml index 17abbcf..4dc532d 100644 --- a/roles/gathio/tasks/main.yml +++ b/roles/gathio/tasks/main.yml @@ -60,9 +60,8 @@ - name: install npm dependencies npm: - path: '{{ gathio_install_dir }}' production: yes - no_optional: no + path: '{{ gathio_install_dir }}' become: yes become_user: '{{ gathio_user }}' when: gathio_git.changed diff --git a/roles/gathio/templates/var/lib/gathio/gathio/config/domain.js.j2 b/roles/gathio/templates/var/lib/gathio/gathio/config/domain.js.j2 index 0815294..144900b 100644 --- a/roles/gathio/templates/var/lib/gathio/gathio/config/domain.js.j2 +++ b/roles/gathio/templates/var/lib/gathio/gathio/config/domain.js.j2 @@ -1,9 +1,9 @@ module.exports = { - 'domain' : '{{ gathio_domain }}' , + 'domain' : '{{ gathio_server_name }}' , 'port': '{{ gathio_port }}', 'email': '{{ gathio_from_address }}', 'mailService': 'nodemailer', - 'sitename': 'gathio', + 'sitename': '{{ gathio_site_name }}', 'isFederated': false, 'logo_url': '', 'showKofi': false, diff --git a/roles/gathio/vars/main.yml b/roles/gathio/vars/main.yml index 68f584b..59854fd 100644 --- a/roles/gathio/vars/main.yml +++ b/roles/gathio/vars/main.yml @@ -2,11 +2,19 @@ gathio_packages: - mongodb-org - nodejs - git + - make + - gcc + - g++ gathio_git_repo: https://github.com/lowercasename/gathio gathio_home: /var/lib/gathio gathio_install_dir: '{{ gathio_home }}/gathio' +gathio_apache_config: | + {{ apache_proxy_config }} + ProxyPass / http://127.0.0.1:{{ gathio_port }}/ + ProxyPassReverse / http://127.0.0.1:{{ gathio_port }}/ + gathio_mongodb_selinux_policy_te: | require { type sysctl_fs_t; |