diff options
Diffstat (limited to 'hiera/aardwolf.yaml')
| -rw-r--r-- | hiera/aardwolf.yaml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/hiera/aardwolf.yaml b/hiera/aardwolf.yaml index 498a063..19d96ab 100644 --- a/hiera/aardwolf.yaml +++ b/hiera/aardwolf.yaml @@ -68,11 +68,7 @@ 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" @@ -184,11 +180,7 @@ 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----- |