Skip to content

Check if server is already an ip address #13

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Check if server is already an ip address #13

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6289d86
Check if server is already an ip address
seocam Nov 28, 2016
06d67cb
Merge branch 'master' into server-is-ip
tedivm Dec 19, 2016
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
6 changes: 5 additions & 1 deletion manifests/client/user.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,11 @@
## Get Key for remote backup user
if $push_ssh_key {
$server_user_exploded = "${server_user}@${server}"
$backup_server_ip = inline_template("<% _erbout.concat(Resolv::DNS.open.getaddress('${server}').to_s) %>")
if is_ip_address($server) {
$backup_server_ip = $server
} else {
$backup_server_ip = inline_template("<% _erbout.concat(Resolv::DNS.open.getaddress('${server}').to_s) %>")
}
sshkeys::set_authorized_key { "${server_user_exploded} to ${client_user}":
local_user => $client_user,
remote_user => $server_user_exploded,
Expand Down
4 changes: 4 additions & 0 deletions metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
"name": "saz/sudo",
"version_requirement": "< 4.0.0"
}
{
"name": "puppetlabs-stdlib",
"version_requirement": "< 2.2.0"
},
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this json valid? It seems like there should be a comma there.

],
"operatingsystem_support": [
{ "operatingsystem": "Debian", "operatingsystemrelease": ["6", "7"]},
Expand Down