diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-04-03 14:56:55 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-04-03 14:56:55 -0400 |
| commit | d5de19a95e2311b3bd77e9d96efd5b95b23d3f0a (patch) | |
| tree | 8c36fd43f2999048a8f1d6cdd6841f14fa03a66e | |
| parent | a8c6f64662578882e3470ba0fe013677108aa4f4 (diff) | |
| parent | 21a908f536e69bfc1ba76072bb27080794a71228 (diff) | |
Merge branch 'joeyconfig'
| l--------- | config.hs | 2 | ||||
| -rw-r--r-- | joeyconfig.hs | 2 | ||||
| -rw-r--r-- | privdata/relocate | 1 |
3 files changed, 3 insertions, 2 deletions
@@ -1 +1 @@ -config-simple.hs
\ No newline at end of file +joeyconfig.hs
\ No newline at end of file diff --git a/joeyconfig.hs b/joeyconfig.hs index 3414d80e..e73897b4 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -651,8 +651,8 @@ monsters = -- but do want to track their public keys etc. & ipv6 "2001:4830:1600:492::2" & ipv4 "67.223.19.96" , host "animx" $ props - & ipv4 "76.7.162.101" & ipv4 "76.7.162.186" + & ipv4 "76.7.162.187" ] diff --git a/privdata/relocate b/privdata/relocate new file mode 100644 index 00000000..271692d8 --- /dev/null +++ b/privdata/relocate @@ -0,0 +1 @@ +.joeyconfig |