diff --git a/.etckeeper b/.etckeeper index 82e1c545..d61fbb20 100755 --- a/.etckeeper +++ b/.etckeeper @@ -454,7 +454,7 @@ maybe chmod 0644 'exim4/conf.d/transport/30_exim4-config_remote_smtp' maybe chmod 0644 'exim4/conf.d/transport/30_exim4-config_remote_smtp_smarthost' maybe chmod 0644 'exim4/conf.d/transport/35_exim4-config_address_directory' maybe chmod 0644 'exim4/exim4.conf.template' -maybe chgrp 'ssh' 'exim4/passwd.client' +maybe chgrp 'Debian-exim' 'exim4/passwd.client' maybe chmod 0640 'exim4/passwd.client' maybe chmod 0644 'exim4/update-exim4.conf.conf' maybe chmod 0755 'fail2ban' diff --git a/aliases b/aliases index f12213f2..54cfe934 100644 --- a/aliases +++ b/aliases @@ -11,3 +11,5 @@ ftp: root abuse: root noc: root security: root +rush: root +root: admin@ovalwonder.com diff --git a/group b/group index ae14ffe6..0afded17 100644 --- a/group +++ b/group @@ -56,3 +56,4 @@ middle:x:1001: jgdye:x:1000: bind:x:113: Debian-exim:x:114: +duck:x:115: diff --git a/group- b/group- index 1ad32640..ae14ffe6 100644 --- a/group- +++ b/group- @@ -55,3 +55,4 @@ gpio:x:997: middle:x:1001: jgdye:x:1000: bind:x:113: +Debian-exim:x:114: diff --git a/gshadow b/gshadow index d676b9a6..3554c2a2 100644 --- a/gshadow +++ b/gshadow @@ -56,3 +56,4 @@ middle:!:: jgdye:!:: bind:!:: Debian-exim:!:: +duck:!:: diff --git a/gshadow- b/gshadow- index fa95d022..d676b9a6 100644 --- a/gshadow- +++ b/gshadow- @@ -55,3 +55,4 @@ gpio:!:: middle:!:: jgdye:!:: bind:!:: +Debian-exim:!:: diff --git a/passwd b/passwd index ec544ed2..1712b36b 100644 --- a/passwd +++ b/passwd @@ -29,3 +29,4 @@ middle:x:1001:1001:,,,:/home/middle:/bin/bash jgdye:x:1000:1000:Joshua Dye,,,:/home/jgdye:/usr/bin/zsh bind:x:109:113::/var/cache/bind:/usr/sbin/nologin Debian-exim:x:110:114::/var/spool/exim4:/usr/sbin/nologin +duck:x:111:115::/home/duck:/usr/sbin/nologin diff --git a/passwd- b/passwd- index 4b0efb6d..1712b36b 100644 --- a/passwd- +++ b/passwd- @@ -28,3 +28,5 @@ avahi:x:108:112:Avahi mDNS daemon,,,:/var/run/avahi-daemon:/bin/false middle:x:1001:1001:,,,:/home/middle:/bin/bash jgdye:x:1000:1000:Joshua Dye,,,:/home/jgdye:/usr/bin/zsh bind:x:109:113::/var/cache/bind:/usr/sbin/nologin +Debian-exim:x:110:114::/var/spool/exim4:/usr/sbin/nologin +duck:x:111:115::/home/duck:/usr/sbin/nologin diff --git a/resolv.conf.bak b/resolv.conf.bak index cae093a8..bb781c9c 100644 --- a/resolv.conf.bak +++ b/resolv.conf.bak @@ -1 +1 @@ -nameserver 8.8.8.8 +nameserver 8.8.8.8 \ No newline at end of file diff --git a/shadow b/shadow index 1c49199e..855695dd 100644 --- a/shadow +++ b/shadow @@ -29,3 +29,4 @@ middle:$6$M8N7aBIv$5gaTB8ACCVT1N0DidZviQ3.T/YarR/FIkd86BUFDUxURJF32Wa.c1.KC6CNNp jgdye:$6$taLG2n/D$WCkHqVIY3aICSXIeg9pfcjEHPX1WWlnTGO8SUqXfXM/3ns56GVKCwxeKvgvzLBF3Ix3QuenmuST9.u8E.XNYD/:17452:0:99999:7::: bind:*:17452:0:99999:7::: Debian-exim:!:17452:0:99999:7::: +duck:*:17452:0:99999:7::: diff --git a/shadow- b/shadow- index 1c49199e..855695dd 100644 --- a/shadow- +++ b/shadow- @@ -29,3 +29,4 @@ middle:$6$M8N7aBIv$5gaTB8ACCVT1N0DidZviQ3.T/YarR/FIkd86BUFDUxURJF32Wa.c1.KC6CNNp jgdye:$6$taLG2n/D$WCkHqVIY3aICSXIeg9pfcjEHPX1WWlnTGO8SUqXfXM/3ns56GVKCwxeKvgvzLBF3Ix3QuenmuST9.u8E.XNYD/:17452:0:99999:7::: bind:*:17452:0:99999:7::: Debian-exim:!:17452:0:99999:7::: +duck:*:17452:0:99999:7:::