Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove build_from_src option #252

Merged
merged 3 commits into from
Dec 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 0 additions & 54 deletions defaults/main/build.yml

This file was deleted.

2 changes: 2 additions & 0 deletions defaults/main/install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,5 @@ ondemand_dex_package: ondemand-dex # behaviour as for ondemand_package
disable_htcacheclean: false
nodejs_version: 18
ruby_version: 3.1

ood_base_apache_dir: "/var/www/ood"
2 changes: 2 additions & 0 deletions defaults/main/ood_portal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ httpd_auth:
- RequestHeader unset Authorization
- Require valid-user

ood_base_dir: '/opt/ood'

lua_root: "{{ ood_base_dir }}/mod_ood_proxy/lib"
lua_log_level: info

Expand Down
26 changes: 0 additions & 26 deletions tasks/build.yml

This file was deleted.

7 changes: 0 additions & 7 deletions tasks/configure.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
- name: Template passenger locations ini file
ansible.builtin.template:
src: "locations.ini.j2"
dest: "{{ passenger_lib_dir }}/locations.ini"
mode: 'u=rw,g=r,o=r'
when: install_from_src

- name: Template apache file
ansible.builtin.template:
src: "{{ item.src }}"
Expand Down
78 changes: 0 additions & 78 deletions tasks/deps.yml

This file was deleted.

82 changes: 0 additions & 82 deletions tasks/install-src.yml

This file was deleted.

18 changes: 0 additions & 18 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,10 @@
ansible.builtin.fail:
msg: "unable to find anything in vars/ for this operating system! {{ ansible_distribution }}"

- name: Include dependencies when building from source
ansible.builtin.import_tasks: deps.yml
become: true
tags: [ 'deps' ]
when: install_from_src

- name: Include built tasks when building from source
ansible.builtin.import_tasks: build.yml
tags: [ 'build' ]
when: install_from_src

- name: Include install tasks when building from source
ansible.builtin.import_tasks: install-src.yml
become: true
tags: [ 'install' ]
when: install_from_src

- name: Include install tasks when installing package
ansible.builtin.import_tasks: install-package.yml
become: true
tags: [ 'install' ]
when: not install_from_src

- name: Include configure tasks when configuring
ansible.builtin.import_tasks: configure.yml
Expand Down
14 changes: 0 additions & 14 deletions templates/locations.ini.j2

This file was deleted.

73 changes: 0 additions & 73 deletions templates/nginx.conf.j2

This file was deleted.

6 changes: 0 additions & 6 deletions templates/ood-sudoers.j2

This file was deleted.

Loading