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.

Sign up for GitHub

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

Jump to bottom

update to 1.0.0 +minor changes #4

Merged
merged 3 commits into from
Jan 14, 2020
Merged

update to 1.0.0 +minor changes #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff11b51
add rdp ignore-cert option
juju4 Jan 11, 2020
841d525
guacamole_basic_user_mapping, guacd-port options
juju4 Jan 11, 2020
495e26e
update to 1.0.0
juju4 Jan 11, 2020
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
4 changes: 3 additions & 1 deletion defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ guacamole_server_package: "{{ 'guacamole-server-' + guacamole_version + '.tar.gz

guacamole_server_port: 4822

#guacamole_basic_user_mapping: /etc/guacamole/user-mapping.xml

guacamole_src_dir: /usr/local/src

guacamole_users: []
Expand All @@ -82,4 +84,4 @@ guacamole_users: []
# password: password
# Define version to install
# 0.9.13-incubating | 0.9.14
guacamole_version: 0.9.14
guacamole_version: 1.0.0
12 changes: 8 additions & 4 deletions templates/etc/guacamole/guacamole.properties.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
{{ ansible_managed | comment }}
auth-provider: {{ guacamole_auth_provider }}
# basic-user-mapping: /etc/guacamole/user-mapping.xml
# guacd-hostname: {{ ansible_hostname }}
# guacd-port: {{ guacamole_server_port }}
{% if guacamole_basic_user_mapping is defined and guacamole_basic_user_mapping|string %}
basic-user-mapping: {{ guacamole_basic_user_mapping }}
{% endif %}
guacd-hostname: {{ ansible_hostname }}
{% if guacamole_server_port is defined and guacamole_server_port|int %}
guacd-port: {{ guacamole_server_port }}
{% endif %}
user-mapping: /etc/guacamole/user-mapping.xml
{% if guacamole_mysql_auth %}
mysql-hostname: {{ guacamole_mysql_db['host'] }}
mysql-port: {{ guacamole_mysql_db['port'] }}
mysql-database: {{ guacamole_mysql_db['name'] }}
mysql-username: {{ guacamole_mysql_db['username'] }}
mysql-password: {{ guacamole_mysql_db['password'] }}
{% endif %}
{% endif %}
1 change: 1 addition & 0 deletions templates/etc/guacamole/user-mapping.xml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<param name="height">{{ guacamole_rdp_height }}</param>
<param name="width">{{ guacamole_rdp_width }}</param>
<param name="security">{{ guacamole_rdp_security }}</param>
<param name="ignore-cert">{{ guacamole_rdp_ignore_cert | default('false') }}</param>
<param name="disable-auth">{{ guacamole_rdp_disable_auth|lower }}</param>
{% endif %}
{% if connection['protocol'] == "vnc" %}
Expand Down