Skip to content

Commit

Permalink
Merge pull request #2 from erasche/ssl
Browse files Browse the repository at this point in the history
also support create/not of dir
  • Loading branch information
natefoo authored Jan 26, 2019
2 parents ee04761 + 41daabf commit 8d561a0
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 0 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Role Variables
SQLConnectInfo documentation for the "connection-info" parameter][proftpd-sql-connect-info] for details.
- `galaxy_user`: The name of the user running the Galaxy server.
- `galaxy_ftp_upload_dir`: Path to the Galaxy FTP upload directory, should match `ftp_upload_dir` in your Galaxy config.
- `proftpd_create_ftp_upload_dir` can be used to allow the role to create this with owner `galaxy_user`
- Additionally, you should set `User` and `Group` in `proftpd_options` to the user and group names of your Galaxy user.

[proftpd-sql-connect-info]: http://www.proftpd.org/docs/contrib/mod_sql.html#SQLConnectInfo
Expand Down
2 changes: 2 additions & 0 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ proftpd_tls_sesscache_timeout: 300
proftpd_tls_renegotiate: null

proftpd_deploy_ssl: false

proftpd_create_ftp_upload_dir: false
8 changes: 8 additions & 0 deletions tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,14 @@
backup: yes
with_items: "{{ proftpd_virtualhosts | default([]) }}"

- name: Create parent ftp directory if needed
file:
path: "{{ galaxy_ftp_upload_dir }}"
owner: "{{ galaxy_user }}"
mode: "0750"
state: directory
when: proftpd_create_ftp_upload_dir

- name: Ensure ProFTPD is started and enabled
service:
name: proftpd
Expand Down

0 comments on commit 8d561a0

Please sign in to comment.