Skip to content

Commit

Permalink
Match the same type.
Browse files Browse the repository at this point in the history
  • Loading branch information
seth-reeser committed Sep 15, 2015
1 parent 8077bc2 commit 0fd5440
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion VERSION.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version: 1.7.4
version: 1.7.5
8 changes: 4 additions & 4 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -643,14 +643,14 @@ configuration["environments"].each do |environment,data|
puts " - [created] #{droplet["created_at"]} [slug] #{droplet["size"]["slug"]} [region] #{droplet["region"]["name"]} [kernel] #{droplet["kernel"]["name"]}"
puts " - [ipv4_public] #{droplet_ip["ip_address"]} [ipv4_private] #{droplet_ip_private["ip_address"]}"
# get public ip address and write to secrets/configuration.yml
unless configuration["environments"]["#{environment}"]["servers"]["redhat"]["ip"] == "#{droplet_ip["ip_address"]}"
unless configuration["environments"]["#{environment}"]["servers"]["redhat"]["ip"] == droplet_ip["ip_address"]
configuration["environments"]["#{environment}"]["servers"]["redhat"]["ip"] = "#{droplet_ip["ip_address"]}"
`gpg --verbose --batch --yes --passphrase "#{configuration_user["settings"]["gpg_key"]}" --output secrets/configuration.yml --decrypt secrets/configuration.yml.gpg`
File.open('secrets/configuration.yml', 'w') {|f| f.write configuration.to_yaml }
`gpg --verbose --batch --yes --passphrase "#{configuration_user["settings"]["gpg_key"]}" --output secrets/configuration.yml.gpg --armor --cipher-algo AES256 --symmetric secrets/configuration.yml`
end
# get private ip address and write to secrets/configuration.yml
unless configuration["environments"]["#{environment}"]["servers"]["redhat"]["ip_private"] == "#{droplet_ip_private["ip_address"]}"
unless configuration["environments"]["#{environment}"]["servers"]["redhat"]["ip_private"] == droplet_ip_private["ip_address"]
configuration["environments"]["#{environment}"]["servers"]["redhat"]["ip_private"] = "#{droplet_ip_private["ip_address"]}"
`gpg --verbose --batch --yes --passphrase "#{configuration_user["settings"]["gpg_key"]}" --output secrets/configuration.yml --decrypt secrets/configuration.yml.gpg`
File.open('secrets/configuration.yml', 'w') {|f| f.write configuration.to_yaml }
Expand Down Expand Up @@ -683,14 +683,14 @@ configuration["environments"].each do |environment,data|
puts " - [created] #{droplet["created_at"]} [slug] #{droplet["size"]["slug"]} [region] #{droplet["region"]["name"]} [kernel] #{droplet["kernel"]["name"]}"
puts " - [ipv4_public] #{droplet_ip["ip_address"]} [ipv4_private] #{droplet_ip_private["ip_address"]}"
# get public ip address and write to secrets/configuration.yml
unless configuration["environments"]["#{environment}"]["servers"]["redhat_mysql"]["ip"] == "#{droplet_ip["ip_address"]}"
unless configuration["environments"]["#{environment}"]["servers"]["redhat_mysql"]["ip"] == droplet_ip["ip_address"]
configuration["environments"]["#{environment}"]["servers"]["redhat_mysql"]["ip"] = "#{droplet_ip["ip_address"]}"
`gpg --verbose --batch --yes --passphrase "#{configuration_user["settings"]["gpg_key"]}" --output secrets/configuration.yml --decrypt secrets/configuration.yml.gpg`
File.open('secrets/configuration.yml', 'w') {|f| f.write configuration.to_yaml }
`gpg --verbose --batch --yes --passphrase "#{configuration_user["settings"]["gpg_key"]}" --output secrets/configuration.yml.gpg --armor --cipher-algo AES256 --symmetric secrets/configuration.yml`
end
# get private ip address and write to secrets/configuration.yml
unless configuration["environments"]["#{environment}"]["servers"]["redhat_mysql"]["ip_private"] == "#{droplet_ip_private["ip_address"]}"
unless configuration["environments"]["#{environment}"]["servers"]["redhat_mysql"]["ip_private"] == droplet_ip_private["ip_address"]
configuration["environments"]["#{environment}"]["servers"]["redhat_mysql"]["ip_private"] = "#{droplet_ip_private["ip_address"]}"
`gpg --verbose --batch --yes --passphrase "#{configuration_user["settings"]["gpg_key"]}" --output secrets/configuration.yml --decrypt secrets/configuration.yml.gpg`
File.open('secrets/configuration.yml', 'w') {|f| f.write configuration.to_yaml }
Expand Down

0 comments on commit 0fd5440

Please sign in to comment.