diff options
| author | Micah Anderson <micah@riseup.net> | 2016-04-20 18:47:44 -0300 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2016-04-20 18:55:28 -0300 |
| commit | 1cfa070a8303de8794605695e56ad8085b697646 (patch) | |
| tree | ba93d6a18bbcf7dc5dcac9ada4e849ddb921c6a2 /hiera/aardwolf.yaml | |
| parent | dd6dbf179b94d6949d210e9a61457deedf03b0e1 (diff) | |
new unstable environment
Diffstat (limited to 'hiera/aardwolf.yaml')
| -rw-r--r-- | hiera/aardwolf.yaml | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/hiera/aardwolf.yaml b/hiera/aardwolf.yaml index bba13b0..498a063 100644 --- a/hiera/aardwolf.yaml +++ b/hiera/aardwolf.yaml @@ -4,6 +4,7 @@ contacts: couch: mode: plain port: 5984 + pwhash_alg: pbkdf2 users: admin: password: LYaDX9L9QKe2Re6p8dFKhu_t2XCxTqNZ @@ -57,7 +58,7 @@ hosts: cat: domain_full: cat.unstable.bitmask.net domain_internal: cat.unstable.bitmask.i - host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDlZP1jixPvDC+tI5cQpV8GpK5+OciNyCJyzdxZ0tiP6xjz76WWhynALuGQyJJilNPZLVnVnX7tLvw1aeRkvopQdF7J1f6AM+JbmX3jNqCXDjellcSPWtiKKJ2szaObfZ0yi+zkzSlG+umZ1xhMLgRHAPJaVqeNQVXygQhtuzAzd+Qpm1EAf8M8x6PJIu/Ui3S4nnB/eaZW7JtnTMhBiNzhMBsITp1ZRe4rhlH3ZrKgAztlBQix7jfRo8kXvZi65fWt0T44mjGgO5gdcZnTrGSJoJIdCN9IzESH+szc9jNJKpti0s4g3EU/pm8gfDLnI2V9J4/dOnH9/BlKfnUxbdWV" + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDj61YBIu6Aj50z56wQSsPOxhlrZ9+8nOuxdf6lcszevagNEaoQDxoAcvyz3jB03NXHTRM6cTRSw5FRQFAcJqaaY1+ZrKxA5Dtjp7aC8cZ3FQ5iEOsgKhMpZgf40LBaGkSgY9qgzPvYTu6Xat9LAXISlhLlhjAY4U/Jr6Eu0EUeq2z9BrAusrOMtlG4P5/jLCt1tsXhZ/jx6LtAgrX0a04SSy/Rhb+Csuyh+PXDXTQyy2SRD0xDYH1crIugnFpkOIyXj3wAqWQIGYqehCXvZNFFbhEHOoRR6MsWxcuVIMT8b80XzOfKwPCsEulWQNJScn3SebudcuhLygJoGVW3lVXD" ip_address: "199.119.112.206" port: 22 donkey: @@ -67,7 +68,11 @@ hosts: - unstable.bitmask.net domain_full: donkey.unstable.bitmask.net domain_internal: donkey.unstable.bitmask.i +<<<<<<< dd6dbf179b94d6949d210e9a61457deedf03b0e1 host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDeGJUfpwMo9Iw6cSY4Z5SRuJ9/DjxEUU37qF35MfhLnSzaQO8I/SATo93X5wL+wP4M9XxJoOhiB3PQh27QfAKiDr6ZT5xAqYCThG/vLx9v7bP9ROayZxaSisMxI0hVOXAzFt5CXX0W0Bh9XlM8rhmdobnAIhqm2vt1g6seYRCPGLX7O6qgddveFQ7TzL6eFco55nlhHXhM+s3rXTY5FCOCB5zETW80zpKencwdt2H8+CDhYru/rRKbv1BDvvM28+noOrMS1MLjKeCLvHKNFymNdOSqdmBwyiNE6afpuVXDq+Q+CG/0qvbyDEJX31CnGtHYkz3LBqOBh+OOi6YfqTl" +======= + host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC95g1uv5y+UolV7tzgScG3Y8OxERwgPCWlVy2O+UAXO+GEiGZ9iPPJbMSu3VAzXG/7I8x3M9ZlyQGTtG9TiVKQAR/cTL7PWJir8GClhoHoqsbrj8xuQuDLvaRG5MKqaU7yLNR8bBdSRdn9ObCFr8S+tWbXCpLhLB4m3/vfuMxZAdVdrFw3cn9O5QdBp2icFiDAWAIjr9brXM5c5FBPg2lTpfEkQoUAIBIvA8W2+Tj3cvYrG5WIa0w4+LCN9c5NvYH3xYNSZESU7p1P50OnhOFT2zbKneGBcLc74ZsEhR3vwHPmpe/62yCqrGZTZF8Z6Hr3/kq5/Bd58yqjH1uUw0Jh" +>>>>>>> new unstable environment ip_address: "199.119.112.207" port: 22 ip_address: "199.119.112.205" @@ -110,7 +115,7 @@ sources: type: git platform: apt: - basic: "http://deb.leap.se/experimental-0.8" + basic: "http://deb.leap.se/0.8" soledad: package: soledad-server revision: latest @@ -179,7 +184,11 @@ testing: api_hosts: - donkey.unstable.bitmask.net api_uri: "https://api.unstable.bitmask.net:4430/1" +<<<<<<< dd6dbf179b94d6949d210e9a61457deedf03b0e1 monitor_auth_token: pAfrMH9kd7FfdKq5m2k9FxYhghhpZ5Qr +======= + monitor_auth_token: AuAf4eu94UfDNLqnujJLrbLVnBxRHPeR +>>>>>>> new unstable environment x509: ca_cert: | -----BEGIN CERTIFICATE----- |