Skip to content

Commit

Permalink
WAS - use var for security password (#57)
Browse files Browse the repository at this point in the history
* use var for security password

* makd appserver props more consistent

* update galaxy version

* fix path for iim
  • Loading branch information
salob authored Sep 26, 2023
1 parent 5902e46 commit 98beb65
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 11 deletions.
2 changes: 1 addition & 1 deletion galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ name: spm_middleware

# The version of the collection. Must be compatible with semantic versioning
# Please note. version also exists in /github/workflows/release.yml and will need to be update also
version: 1.2.8
version: 1.2.9

# The path to the Markdown (.md) readme file. This path is relative to the root of the collection
readme: README.md
Expand Down
3 changes: 3 additions & 0 deletions roles/liberty/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ liberty_version: 23.0.0.6
liberty_default_heapsize: 1024m
liberty_enable_verbose_gc: false
liberty_extra_jvm_options: []
security_username: websphere
# use encrypted password
security_password: dummypassword

# Common
profiled_path: /opt/profile.d
Expand Down
5 changes: 3 additions & 2 deletions roles/liberty/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,11 @@
when: ansible_os_family != "Windows"

- name: Copy AppServer.properties
copy:
src: AppServer.properties
template:
dest: /opt/Props/AppServer.properties
src: AppServer.properties.j2
mode: 0644
force: no

- name: Create environment files
include_tasks: env.yml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
as.vendor=WLP

# The username and password for admin server.
security.username=websphere
security.username={{ security_username }}
# Encrypt the plain-text password using 'build encrypt -Dpassword=<password>'
security.password=websphere
security.password={{ security_password }}

# The name of the WebSphere Node or WebLogic Domain Name.
node.name=liberty
Expand All @@ -29,4 +29,4 @@ curam.client.httpport=10101

# HTTP Port for the server on which the Web services
# will be accessed
curam.webservices.httpport=10102
curam.webservices.httpport=10102
4 changes: 2 additions & 2 deletions roles/weblogic/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ domains_home: '{{ weblogic_base }}/config/Domains'
applications_home: '{{ weblogic_base }}/config/applications'
mw_installer_folder: '{{ weblogic_base }}/installer'
domain_username: 'weblogic'
domain_password: 'weblogic'
encrypted_password: 'weblogic1'
domain_password: 'dummypassword'
encrypted_password: 'dummypassword'
server_name: 'CuramServer'
server_port: 7001

Expand Down
3 changes: 3 additions & 0 deletions roles/websphere/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ iim_install_path: /opt/IBM/InstallationManager
# websphere
websphere_install_path: /opt/IBM/WebSphere/AppServer
websphere_version: 9.0.5.10
security_username: websphere
# use encrypted password
security_password: dummypassword
# Common
profiled_path: /opt/profile.d
# Server info for downloading installers / repos directly, leave blank to copy
Expand Down
2 changes: 1 addition & 1 deletion roles/websphere/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
template:
dest: /opt/Props/AppServer.properties
src: AppServer.properties.j2
mode: 0755
mode: 0644
force: no

- name: Cleanup
Expand Down
4 changes: 2 additions & 2 deletions roles/websphere/templates/AppServer.properties.j2
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
as.vendor=IBM

# The username and password for admin server.
security.username=websphere
security.username={{ security_username }}
# Encrypt the plain-text password using 'build encrypt -Dpassword=<password>'
# NOTE: This must be updated after your first login!
security.password=websphere
security.password={{ security_password }}

# The name of the WebSphere Node or WebLogic Domain Name.
node.name={{ansible_hostname}}
Expand Down

0 comments on commit 98beb65

Please sign in to comment.