summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--files/ssh/known_hosts1
-rw-r--r--hiera/clam.yaml4
-rw-r--r--hiera/deer.yaml4
-rw-r--r--hiera/demodex.yaml4
-rw-r--r--hiera/elephant.yaml4
-rw-r--r--hiera/ladybug.yaml4
-rw-r--r--hiera/snail.yaml4
-rw-r--r--hiera/starfish.yaml9
-rw-r--r--provider.development.json2
9 files changed, 16 insertions, 20 deletions
diff --git a/files/ssh/known_hosts b/files/ssh/known_hosts
index e7076ca..c65d324 100644
--- a/files/ssh/known_hosts
+++ b/files/ssh/known_hosts
@@ -20,7 +20,6 @@ hippo,hippo.bitmask.i,hippo.bitmask.net,85.17.92.143 ecdsa-sha2-nistp256 AAAAE2V
ladybug,ladybug.dev.bitmask.i,ladybug.dev.bitmask.net,199.119.112.8 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDB2QMVLYRTwLfZzafas9wTfh1OsHCuRFc1yfezZt/hPPYbNREkbDLW7xgvCBFAqZdRU/1EEyzTdLwUPWP7RtFRSVPrBn3Re9Y2DmVno4YR/7SklWo330tc3aNX5sVFfvgSLHqe4T/SOSmQvjPz/AxkRekIi7Rsjrew9C3SiCZ9S3PygxEQw3XnPoeh4Kju1fl7eXSzLwWVu1TtUJvRn6gbP9+qTY5/1e9MHEBD0zOXO7tAcRWwjkzMPdQ1GgMqvAqamtIXOmG2RWXApeaitix8qZQlC/eb1pJzlh2b5MNiizJPS1rCqnGSN3Jx6H5CqthKWu1JaUzxGhLacuu5AWSN
leech,leech.demo.bitmask.i,leech.demo.bitmask.net,198.252.153.85 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCiT3/fejkQIAny1f71ijFYaSEcYho6gR10z20ctmLumV3pHtXcFXtHqzAFJ07txANyef5P/yiIOl+/x/uRANjo=
millipede,millipede.demo.bitmask.i,millipede.demo.bitmask.net,198.252.153.83 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBG02MrdDFaqZO11JbYSAAC5q/W/FCch3AQXo+dRcpErvHLmv9kWkrV1ESqfZ+s6qEfk8Aqv0vsym7YigMiGXlBo=
-octopus,octopus.unstable.bitmask.i,octopus.unstable.bitmask.net,199.119.112.16 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLbvsEZGXVaC74PcXd/M4wwv7nnAhg3318EqcGbo2aX5Tt+mAYbxjLj+HAiJgG63Mp6+GEuH5KNwgrRNwaOqh84tOMOYOKFAdgha4z6WC9q9sFIkqwaE2KDfoENKyUo0ywb0aBAW0EvYMt92BL7p5T8oQr/SbFw/GW1iyEqCPFK4VcupdnjDd8wyolgLawg0Okah5IHVosuJQEZXii7I0nhAl5OUkn5DIr6NklW6gTht+m6yRl7KNS+SGfyZs5U/1NywtwqPIH5Zgwt3Cphzga+d++6HbpO3PXA1PmN/bYJGDC0zG9gDSae1mvc+pDWWELgHEfpjzigrqqeNJtO2UD
otter,otter.demo.bitmask.i,otter.demo.bitmask.net,46.165.242.166 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCab6r51XEW9LjZVDZs3q/aIpn+oKo468ovivZIQPMmYMs6NUJ2z7Oc9YROAM3lfxcHHShNBIpxg/pSKnQ743hHavV3y+mEPbo4W3hbByuR6GJRaKxHP42NMfNxJUHpaix8jCrMkNypFGMss9C403quy62yGfN7hWIH/pWFR9z+GvWaLpl0J1T+sadeqYGrjiWPwmo88ZAo/RRsXEORyPMz/X7+pa+DvYrg9FqOnNNK0EvHI5asxRQMojpbt6DRpOkkDPkFZp/gpGRQCAbnaKtalkfC/HhbHepGiqQwMRphcpTmnJvOfIGy+YnUoV3RwoRzb5HAT6FkJ9c4gsTs+6Rp
seahorse,seahorse.unstable.bitmask.i,seahorse.unstable.bitmask.net,199.119.112.12 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfIO4Zdb7Xl1xP3Nw6hCSRSU9t6D2l3HpP38V1VM+2sLHDUdGDlHYWgUlfril5wZ6DdvU1DO2xrSTPDR1LrLEk/OKuFthnNUmRfE+NQQbf/KjEfj+AFj36l9evbWwef/EwECOtydQYZTEabVvrt0yprHYnfd728UklkFjXg67962X9A8DtK2OcPovEbcpPA3vo88+SZukNXAFUQcZPbX5ux0WZ1RH0GQVLVFo0dL4dQdEHZIXVYNvI9X7FzcN4WNjYyZfibiCmo3zdv15Hybh1NMQtBC6H5ZtiykzqL7cbUmmKeYzgIycFnewUxr6P4WyWx7/kPqfR/0Dw5aQqufw1
snail,snail.dev.bitmask.i,snail.dev.bitmask.net,176.53.69.14 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDc9ClDw538Yojfi9WabepcQCdANP8zhF7wExHw3h3VY08CjUfTojZZyYg6EV3X6Itqm73yj6O6+NvWWQ1zXXkCMkyhXmCPJAw/QEcZJLfQUgyv18gLFcLKo7mmhfFtB5+cLVljulwPW0Qd3CKBt/GS7WtBZTQS+mvqQSJliE3k0PBbNaYdJ0fWvfMfz739FCKsvPA0ECAiwluaLx8Mp74l+7azhajvWfXpzNy3NAwx5pdsuE+tCJ4y0bfyzn2ZuykdYrCIzoMlVZOSpELz0RsCXQc7izTJEyfa+046gCovDiDQa+SsBEcAjDEXPLgfK7Fi7TZhs4HMIZuu1Y36zuMD
diff --git a/hiera/clam.yaml b/hiera/clam.yaml
index 3ab7c34..c6b068f 100644
--- a/hiera/clam.yaml
+++ b/hiera/clam.yaml
@@ -79,7 +79,7 @@ mail:
name: clam
platform:
major_version: "0.7"
- version: "0.7"
+ version: "0.7.1"
service_type: public_service
services:
- couchdb
@@ -113,7 +113,7 @@ sources:
source: "https://leap.se/git/tapicero"
type: git
webapp:
- revision: origin/version/0.7
+ revision: origin/version/0.7.1
source: "https://leap.se/git/leap_web"
type: git
ssh:
diff --git a/hiera/deer.yaml b/hiera/deer.yaml
index e0d11ca..28eea11 100644
--- a/hiera/deer.yaml
+++ b/hiera/deer.yaml
@@ -27,7 +27,7 @@ mail:
name: deer
platform:
major_version: "0.7"
- version: "0.7"
+ version: "0.7.1"
service_type: internal_service
services:
- tor
@@ -53,7 +53,7 @@ sources:
source: "https://leap.se/git/tapicero"
type: git
webapp:
- revision: origin/version/0.7
+ revision: origin/version/0.7.1
source: "https://leap.se/git/leap_web"
type: git
ssh:
diff --git a/hiera/demodex.yaml b/hiera/demodex.yaml
index ba8b936..9efd8ad 100644
--- a/hiera/demodex.yaml
+++ b/hiera/demodex.yaml
@@ -27,7 +27,7 @@ mail:
name: demodex
platform:
major_version: "0.7"
- version: "0.7"
+ version: "0.7.1"
service_type: internal_service
services:
- backup
@@ -53,7 +53,7 @@ sources:
source: "https://leap.se/git/tapicero"
type: git
webapp:
- revision: origin/version/0.7
+ revision: origin/version/0.7.1
source: "https://leap.se/git/leap_web"
type: git
ssh:
diff --git a/hiera/elephant.yaml b/hiera/elephant.yaml
index 5f962dd..3c39991 100644
--- a/hiera/elephant.yaml
+++ b/hiera/elephant.yaml
@@ -193,7 +193,7 @@ nickserver:
port: 6425
platform:
major_version: "0.7"
- version: "0.7"
+ version: "0.7.1"
service_type: public_service
services:
- webapp
@@ -219,7 +219,7 @@ sources:
source: "https://leap.se/git/tapicero"
type: git
webapp:
- revision: origin/version/0.7
+ revision: origin/version/0.7.1
source: "https://leap.se/git/leap_web"
type: git
ssh:
diff --git a/hiera/ladybug.yaml b/hiera/ladybug.yaml
index 923b088..1f617f9 100644
--- a/hiera/ladybug.yaml
+++ b/hiera/ladybug.yaml
@@ -27,7 +27,7 @@ mail:
name: ladybug
platform:
major_version: "0.7"
- version: "0.7"
+ version: "0.7.1"
service_type: internal_service
services:
- backup
@@ -53,7 +53,7 @@ sources:
source: "https://leap.se/git/tapicero"
type: git
webapp:
- revision: origin/version/0.7
+ revision: origin/version/0.7.1
source: "https://leap.se/git/leap_web"
type: git
ssh:
diff --git a/hiera/snail.yaml b/hiera/snail.yaml
index 46c2bd9..1356c89 100644
--- a/hiera/snail.yaml
+++ b/hiera/snail.yaml
@@ -56,7 +56,7 @@ openvpn:
user_ips: false
platform:
major_version: "0.7"
- version: "0.7"
+ version: "0.7.1"
service_type: user_service
services:
- openvpn
@@ -82,7 +82,7 @@ sources:
source: "https://leap.se/git/tapicero"
type: git
webapp:
- revision: origin/version/0.7
+ revision: origin/version/0.7.1
source: "https://leap.se/git/leap_web"
type: git
ssh:
diff --git a/hiera/starfish.yaml b/hiera/starfish.yaml
index 644baa1..e074e24 100644
--- a/hiera/starfish.yaml
+++ b/hiera/starfish.yaml
@@ -58,26 +58,23 @@ mynetworks:
- "176.53.69.23"
- "192.168.5.10"
- "192.168.5.12"
- - "192.168.5.16"
- "192.168.5.19"
- "192.168.5.23"
- "192.168.5.4"
- "192.168.5.5"
- "192.168.5.8"
- - "192.168.5.9"
- "198.252.153.82"
- "198.252.153.83"
- "198.252.153.85"
- "199.119.112.10"
- "199.119.112.12"
+ - "199.119.112.123"
- "199.119.112.124"
- - "199.119.112.16"
- "199.119.112.19"
- "199.119.112.23"
- "199.119.112.4"
- "199.119.112.5"
- "199.119.112.8"
- - "199.119.112.9"
- "202.85.233.34"
- "204.13.164.162"
- "204.13.164.171"
@@ -87,7 +84,7 @@ mynetworks:
name: starfish
platform:
major_version: "0.7"
- version: "0.7"
+ version: "0.7.1"
service_type: user_service
services:
- mx
@@ -113,7 +110,7 @@ sources:
source: "https://leap.se/git/tapicero"
type: git
webapp:
- revision: origin/version/0.7
+ revision: origin/version/0.7.1
source: "https://leap.se/git/leap_web"
type: git
ssh:
diff --git a/provider.development.json b/provider.development.json
index 31d18eb..f8bef12 100644
--- a/provider.development.json
+++ b/provider.development.json
@@ -3,7 +3,7 @@
"allow_anonymous": false
},
"platform": {
- "branch": "0.7.0"
+ "branch": "develop"
},
"contacts": {
"default": "micah@leap.se"
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 11:21:03 +0000