Mercurial > code > home > repos > infra
changeset 72:f0e59adf7b91
updates that aren't pkg or version changes
| author | drewp@bigasterisk.com |
|---|---|
| date | Sat, 11 Jun 2022 22:56:39 -0700 |
| parents | 52156d3898c5 |
| children | 7e738b6603b7 |
| files | kube.py net.py packages.py tasks.py users.py |
| diffstat | 5 files changed, 13 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/kube.py Sat Jun 11 22:55:10 2022 -0700 +++ b/kube.py Sat Jun 11 22:56:39 2022 -0700 @@ -20,6 +20,8 @@ if host.name in nodes + [server_node]: server.sysctl(key='net.ipv4.ip_forward', value="1", persist=True) server.sysctl(key='net.ipv6.conf.all.forwarding', value="1", persist=True) + server.sysctl(key='fs.inotify.max_user_instances', value='8192', persist=True) + server.sysctl(key='fs.inotify.max_user_watches', value='524288', persist=True) tail = 'k3s' if host.get_fact(Arch) == 'x86_64' else 'k3s-armhf' files.download(
--- a/net.py Sat Jun 11 22:55:10 2022 -0700 +++ b/net.py Sat Jun 11 22:56:39 2022 -0700 @@ -13,7 +13,7 @@ # /lib/systemd/network # These OS files are ok. '/usr/local/lib/systemd/network/', # Probably no such dir. '/run/systemd/network/', # Previous netplan attempts dumped in here. - '/etc/systemd/network/', # I'm going to work in here. + #'/etc/systemd/network/', # I'm going to work in here. ]: files.sync( src="files/empty_dir/", @@ -50,8 +50,7 @@ files.template(src="templates/net/bang_10.2.network.j2", dest="/etc/systemd/network/99-10.2.network") files.template(src="templates/net/bang_isp.network.j2", dest="/etc/systemd/network/99-isp.network") - systemd.service(service='systemd-networkd.service', running=True, restarted=True) - + systemd.service(service='systemd-networkd.service', enabled=True, running=True, restarted=True) elif host.name == 'plus': pass @@ -87,4 +86,4 @@ create_remote_dir=True, mac=host.host_data['mac'], ) - systemd.service(service='systemd-networkd.service', running=True, restarted=True) + systemd.service(service='systemd-networkd.service', enabled=True, running=True, restarted=True)
--- a/packages.py Sat Jun 11 22:55:10 2022 -0700 +++ b/packages.py Sat Jun 11 22:56:39 2022 -0700 @@ -89,8 +89,8 @@ "npm install -g pnpm@7.0.0", ]) -if not is_pi and not (host.name == 'prime'): - apt.packages(packages='mlocate', present=False) +apt.packages(packages='mlocate', present=False) +if not is_pi and host.name not in ['prime', 'pipe']: apt.packages(packages='plocate') if host.name == "bang":
--- a/tasks.py Sat Jun 11 22:55:10 2022 -0700 +++ b/tasks.py Sat Jun 11 22:56:39 2022 -0700 @@ -36,7 +36,6 @@ @task def dns(ctx): ctx.run(cmd + 'inventory.py dns.py', pty=True) - ctx.run(cmd + 'inventory.py dns_check.py', pty=True) @task
--- a/users.py Sat Jun 11 22:55:10 2022 -0700 +++ b/users.py Sat Jun 11 22:56:39 2022 -0700 @@ -25,7 +25,7 @@ 'docker', 'render', ]: - server.group(group=group) + server.group(group=group, system=True) server.group(group='drewp', gid=drewp_gid) server.user(user='drewp', group='drewp', groups=drewp_groups) @@ -44,8 +44,6 @@ server.group(group='damon', gid=3011) server.group(group='ffg', gid=3008) - server.group(group='drewnote', gid=1009) - server.user(user='drewp', uid=drewp_uid, group='drewp', @@ -70,11 +68,12 @@ server.group(group='kelsi', gid=1008) server.user(user='kelsi', uid=1008, group='elastic') - server.group(group='drewnote', gid=1009) - server.user(user='drewnote', uid=1009) + if host.name != 'pipe': # https://github.com/Fizzadar/pyinfra/issues/835 + server.group(group='drewnote', gid=1009) + server.user(user='drewnote', uid=1009) - server.group(group='prometheus', gid=1010) - server.user(user='prometheus', uid=1010) + server.group(group='prometheus', gid=1010) + server.user(user='prometheus', uid=1010) if is_pi: server.group(group='fuse')