Merge branch 'develop' into neoloc/runner
This commit is contained in:
commit
0bed8ba4f4
7
hieradata/nodes/ausyd1nxvm1052.main.unkin.net.yaml
Normal file
7
hieradata/nodes/ausyd1nxvm1052.main.unkin.net.yaml
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
networking::interfaces:
|
||||||
|
eth0:
|
||||||
|
ipaddress: 198.18.13.62
|
||||||
|
networking::routes:
|
||||||
|
default:
|
||||||
|
gateway: 198.18.13.254
|
||||||
7
hieradata/nodes/ausyd1nxvm1053.main.unkin.net.yaml
Normal file
7
hieradata/nodes/ausyd1nxvm1053.main.unkin.net.yaml
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
networking::interfaces:
|
||||||
|
eth0:
|
||||||
|
ipaddress: 198.18.13.63
|
||||||
|
networking::routes:
|
||||||
|
default:
|
||||||
|
gateway: 198.18.13.254
|
||||||
7
hieradata/nodes/ausyd1nxvm1054.main.unkin.net.yaml
Normal file
7
hieradata/nodes/ausyd1nxvm1054.main.unkin.net.yaml
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
networking::interfaces:
|
||||||
|
eth0:
|
||||||
|
ipaddress: 198.18.13.64
|
||||||
|
networking::routes:
|
||||||
|
default:
|
||||||
|
gateway: 198.18.13.254
|
||||||
7
hieradata/nodes/ausyd1nxvm1055.main.unkin.net.yaml
Normal file
7
hieradata/nodes/ausyd1nxvm1055.main.unkin.net.yaml
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
networking::interfaces:
|
||||||
|
eth0:
|
||||||
|
ipaddress: 198.18.13.65
|
||||||
|
networking::routes:
|
||||||
|
default:
|
||||||
|
gateway: 198.18.13.254
|
||||||
7
hieradata/nodes/ausyd1nxvm1056.main.unkin.net.yaml
Normal file
7
hieradata/nodes/ausyd1nxvm1056.main.unkin.net.yaml
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
networking::interfaces:
|
||||||
|
eth0:
|
||||||
|
ipaddress: 198.18.13.66
|
||||||
|
networking::routes:
|
||||||
|
default:
|
||||||
|
gateway: 198.18.13.254
|
||||||
7
hieradata/nodes/ausyd1nxvm1057.main.unkin.net.yaml
Normal file
7
hieradata/nodes/ausyd1nxvm1057.main.unkin.net.yaml
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
networking::interfaces:
|
||||||
|
eth0:
|
||||||
|
ipaddress: 198.18.13.67
|
||||||
|
networking::routes:
|
||||||
|
default:
|
||||||
|
gateway: 198.18.13.254
|
||||||
7
hieradata/nodes/ausyd1nxvm1058.main.unkin.net.yaml
Normal file
7
hieradata/nodes/ausyd1nxvm1058.main.unkin.net.yaml
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
networking::interfaces:
|
||||||
|
eth0:
|
||||||
|
ipaddress: 198.18.13.68
|
||||||
|
networking::routes:
|
||||||
|
default:
|
||||||
|
gateway: 198.18.13.254
|
||||||
@ -135,6 +135,23 @@ glauth::users:
|
|||||||
loginshell: '/bin/bash'
|
loginshell: '/bin/bash'
|
||||||
homedir: '/home/kelren'
|
homedir: '/home/kelren'
|
||||||
passsha256: '5b01659bca1ecb27847d2f746fab03eb169879ebcc86547024753dac7cb184c4'
|
passsha256: '5b01659bca1ecb27847d2f746fab03eb169879ebcc86547024753dac7cb184c4'
|
||||||
|
ryadun:
|
||||||
|
user_name: 'ryadun'
|
||||||
|
givenname: 'Dunbar'
|
||||||
|
sn: 'Ryan'
|
||||||
|
mail: 'ryadun@users.main.unkin.net'
|
||||||
|
uidnumber: 20005
|
||||||
|
primarygroup: 20000
|
||||||
|
othergroups:
|
||||||
|
- 20010 # jelly
|
||||||
|
- 20011 # sonarr
|
||||||
|
- 20012 # radarr
|
||||||
|
- 20013 # lidarr
|
||||||
|
- 20014 # readarr
|
||||||
|
- 20016 # nzbget
|
||||||
|
loginshell: '/bin/bash'
|
||||||
|
homedir: '/home/ryadun'
|
||||||
|
passsha256: 'ee17174d49545f6f7257ae79eb173de4acf2b2edf55e181de90decd0e4b4e617'
|
||||||
|
|
||||||
glauth::services:
|
glauth::services:
|
||||||
svc_jellyfin:
|
svc_jellyfin:
|
||||||
|
|||||||
@ -18,7 +18,7 @@ hiera_include:
|
|||||||
redisha::manage_repo: false
|
redisha::manage_repo: false
|
||||||
redisha::redisha_members_lookup: true
|
redisha::redisha_members_lookup: true
|
||||||
redisha::redisha_members_role: roles::infra::db::redis
|
redisha::redisha_members_role: roles::infra::db::redis
|
||||||
redisha::redis::requirepass: "%{hiera('redisha::masterauth')}"
|
#redisha::redis::requirepass: "%{hiera('redisha::masterauth')}"
|
||||||
redisha::redis::masterauth: "%{hiera('redisha::masterauth')}"
|
redisha::redis::masterauth: "%{hiera('redisha::masterauth')}"
|
||||||
redisha::sentinel::master_name: "%{facts.country}-%{facts.region}"
|
redisha::sentinel::master_name: "%{facts.country}-%{facts.region}"
|
||||||
redisha::sentinel::requirepass: "%{hiera('redisha::masterauth')}"
|
redisha::sentinel::requirepass: "%{hiera('redisha::masterauth')}"
|
||||||
|
|||||||
@ -36,7 +36,8 @@ droneci::volumes:
|
|||||||
- type=bind,source=/etc/pki/tls/certs/ca-bundle.crt,target=/etc/ssl/certs/ca-certificates.crt,readonly
|
- type=bind,source=/etc/pki/tls/certs/ca-bundle.crt,target=/etc/ssl/certs/ca-certificates.crt,readonly
|
||||||
droneci::env_vars:
|
droneci::env_vars:
|
||||||
DRONE_GITEA_SERVER: https://git.query.consul
|
DRONE_GITEA_SERVER: https://git.query.consul
|
||||||
DRONE_GITEA_CLIENT_ID: 3f6abbd9-1838-4d22-8023-f9bd8cf27c82
|
DRONE_GITEA_CLIENT_ID: dda67581-86df-4e65-88ae-1e505b849082
|
||||||
|
DRONE_USER_CREATE: username:unkinben,admin:true
|
||||||
DRONE_GITEA_CLIENT_SECRET: "%{hiera('droneci_server::gitea_client_secret')}"
|
DRONE_GITEA_CLIENT_SECRET: "%{hiera('droneci_server::gitea_client_secret')}"
|
||||||
DRONE_RPC_SECRET: "%{hiera('droneci_server::rpc_secret')}"
|
DRONE_RPC_SECRET: "%{hiera('droneci_server::rpc_secret')}"
|
||||||
DRONE_SERVER_HOST: droneci.query.consul
|
DRONE_SERVER_HOST: droneci.query.consul
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user