From 1fda26ab7eaf41eae992e5a86284044fa3cadc5c Mon Sep 17 00:00:00 2001 From: Darren 'Tadgy' Austin Date: Fri, 3 Apr 2026 14:21:45 +0000 Subject: [PATCH] Use 'directory' for AD name. --- .gitattributesdb | 10 +++--- .../core.slackware.uk.internal_cert.pem | 33 ++++++++++--------- .../core.slackware.uk.internal_fullchain.pem | 33 ++++++++++--------- etc/samba/smb.conf | 10 +++--- 4 files changed, 44 insertions(+), 42 deletions(-) diff --git a/.gitattributesdb b/.gitattributesdb index d91b3a2..c3c737e 100644 --- a/.gitattributesdb +++ b/.gitattributesdb @@ -132,13 +132,13 @@ Y2VydGlmaWNhdGVz - - ZXRjL2NlcnRpZmljYXRlcy8uZ2l0aWdub3Jl 1775222782.056196808 1774126655.398873237 root:root 0644 - - ZXRj 1775062680.263456839 1771501908.000000000 root:root 0755 - - Y2VydGlmaWNhdGVz - - -ZXRjL2NlcnRpZmljYXRlcy9jb3JlLnNsYWNrd2FyZS51ay5pbnRlcm5hbF9jZXJ0LnBlbQ== 1774994233.687225999 1774994233.659226446 root:root 0644 - - +ZXRjL2NlcnRpZmljYXRlcy9jb3JlLnNsYWNrd2FyZS51ay5pbnRlcm5hbF9jZXJ0LnBlbQ== 1775225880.501745884 1775225880.469746406 root:root 0644 - - ZXRj 1775062680.263456839 1771501908.000000000 root:root 0755 - - Y2VydGlmaWNhdGVz - - ZXRjL2NlcnRpZmljYXRlcy9jb3JlLnNsYWNrd2FyZS51ay5pbnRlcm5hbF9jaGFpbi5wZW0= 1775055895.312512834 1775055895.312512834 root:root 0644 - - ZXRj 1775062680.263456839 1771501908.000000000 root:root 0755 - - Y2VydGlmaWNhdGVz - - -ZXRjL2NlcnRpZmljYXRlcy9jb3JlLnNsYWNrd2FyZS51ay5pbnRlcm5hbF9mdWxsY2hhaW4ucGVt 1775055944.127728157 1775055944.127728157 root:root 0644 - - +ZXRjL2NlcnRpZmljYXRlcy9jb3JlLnNsYWNrd2FyZS51ay5pbnRlcm5hbF9mdWxsY2hhaW4ucGVt 1775225997.399843885 1775055944.127728157 root:root 0644 - - ZXRj 1775062680.263456839 1771501908.000000000 root:root 0755 - - Y2VydGlmaWNhdGVz - - ZXRjL2NlcnRpZmljYXRlcy9jb3JlLnNsYWNrd2FyZS51ay5pbnRlcm5hbF9rZXkucGVtLmdwZw== 1775222702.257499732 1775222702.257499732 root:root 0644 - - @@ -523,7 +523,7 @@ ZXRj 1775062680.263456839 1771501908.000000000 root:root 0755 - - ZXRjL3MtbmFpbC5yYw== 1774110388.682978693 1774110134.767164228 root:root 0644 - - ZXRj 1775062680.263456839 1771501908.000000000 root:root 0755 - - c2FtYmE= - - -ZXRjL3NhbWJhL3NtYi5jb25m 1775223497.516531090 1758208516.000000000 root:root 0644 - - +ZXRjL3NhbWJhL3NtYi5jb25m 1775224499.280233823 1758208516.000000000 root:root 0644 - - ZXRj 1775062680.263456839 1771501908.000000000 root:root 0755 - - c2FtYmE= - - ZXRjL3NhbWJhL3NtYnVzZXJz 1758121825.000000000 1758121586.000000000 root:root 0644 - - @@ -706,7 +706,7 @@ bG9n - - QXJjaGl2ZWQ= - - dmFyL2xvZy9BcmNoaXZlZC8uZ2l0aWdub3Jl 1774126984.505500258 1774126984.505500258 root:root 0644 - - dmFy 1773949028.799601180 1771512801.620005134 root:root 0755 - - -dG1w 1775223439.221481278 1771501870.000000000 root:root 1777 - - +dG1w 1775225839.546412277 1771501870.000000000 root:root 1777 - - dmFyL3RtcC8uZ2l0aWdub3Jl 1771459200.000000000 1771459200.000000000 root:root 0644 - - dmFy 1773949028.799601180 1771512801.620005134 root:root 0755 - - d3d3 - - @@ -731,4 +731,4 @@ ZXRj 1775062680.263456839 1771501908.000000000 root:root 0755 - - c3Vkb2Vycy5k - - ZXRjL3N1ZG9lcnMuZC9yb290LWFjY2Vzcw== 1757600157.000000000 1757600157.000000000 root:root 0640 - - aG9tZQ== 1773074781.647958337 1771512801.576005863 root:root 0755 - - -aG9tZS9zeXNhZG1pbg== 1774998073.409599473 1757761412.000000000 sysadmin:users 0711 - - +aG9tZS9zeXNhZG1pbg== 1775225932.576898589 1757761412.000000000 sysadmin:users 0711 - - diff --git a/etc/certificates/core.slackware.uk.internal_cert.pem b/etc/certificates/core.slackware.uk.internal_cert.pem index 1f34f91..228a675 100644 --- a/etc/certificates/core.slackware.uk.internal_cert.pem +++ b/etc/certificates/core.slackware.uk.internal_cert.pem @@ -1,5 +1,5 @@ -----BEGIN CERTIFICATE----- -MIIFGDCCAwCgAwIBAgIIcS29cmr6vBcwDQYJKoZIhvcNAQELBQAwbzELMAkGA1UE +MIIFUDCCAzigAwIBAgIICw+43LW1El4wDQYJKoZIhvcNAQELBQAwbzELMAkGA1UE BhMCR0IxFTATBgNVBAoTDFNsYWNrd2FyZSBVSzEjMCEGA1UEAxMaU2xhY2t3YXJl IFVLIEludGVybmFsIFJvb3QxJDAiBgkqhkiG9w0BCQEWFXN5c2FkbWluQHNsYWNr d2FyZS51azAeFw0yNTAxMDEwMDAwMDBaFw00OTEyMzEyMzU5NTlaMG8xCzAJBgNV @@ -11,20 +11,21 @@ YiCdks94LGrb2lEfG89UPfGKWG9cdMSD44m6scvj7cWh9EUKvkaQ29ThuIWpx4cD UF3z4eF1Nf5cpYy89QtKsH2qsMoED5JKVKgPLX3/JQwDvJilLzgJ/vMAsx7wG9FX GDsYQyeVvIB4DLRqlNIbx76A5ZyPe7QfI/TNfqm4G1Yid0LtXkHgkd1qb5XHdGiG WBgzIM5j/N2CGI3j5CP/VK5aAzN7rnI7HM8x2W+tU2PpFkLXdMLyTBY4ATQhg4EV -K76nDVcITKD5AgMBAAGjgbcwgbQwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUxsMm +K76nDVcITKD5AgMBAAGjge8wgewwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUxsMm ZmzAaqqvGCNV8uzdWUrjx30wHwYDVR0jBBgwFoAUV7XBvimJoYCF5Ppm+4EWAKyy -CB4wDgYDVR0PAQH/BAQDAgPoMEEGA1UdEQQ6MDiCGmNvcmUuc2xhY2t3YXJlLnVr -LmludGVybmFsghpkaXIwLnNsYWNrd2FyZS51ay5pbnRlcm5hbDARBglghkgBhvhC -AQEEBAMCBkAwDQYJKoZIhvcNAQELBQADggIBAFG54lEL00l+F+KV6q3xIZCZxVZy -UoxzTRHyt7bSpoAihTmPLr19zuBAiD06hFkbMaDuSdIY87st94/Bo9Xcmsikpm5R -m1vSYcaMzzhGv/+MRT2wAKNhRUFUF/QtZr9AM8SiHL8BD9i+hRcMMglxyvfKsE0u -Ugc2CJDOXuXRG8AKiVWhW8wIUS2OzMy/NO0xA2QvA6xSsS6RYvsUBw5hWseC7x/C -+jbjscu3/YSCFAB8INvm2nPJLSpgz6iT70iJQIoB8KIZWyPCQTHbcIU/cMQKSbya -OqtMfBjejm68Ai62mffwbeC4IkTVXIujJF/Mun8wRCAFomnFsBt3ATw1pzUhj+Q0 -aD/cBvClYisL5v6v/v/4opJc7mhDZhkuYD64l4wh+can8DGGr7bsvXwUlIiKnjRu -ohDbkmESNsggWpHQcRW8M+GHc0EKbvXc6q169UksX1CJduRCFDqfPlX7FHHZiedj -uHgEe31udovVIc+eL/MQnP8qygx6kLawkeVugNgSjFEqTCeFBHaf3HRcuGalDTUc -8ApJqx0dnJyvXoIfN8OlRKYFrJ8qrJ95No94m2AiMdFC0eKlII4Ox9O8/8TsxZdA -K8KmQCRa7313s25Cd5ZbumxRF53fO19WSh550Bs6QV0HHf4gXrvshkKB3MiqCg13 -Vku0MrBK3rmY2T3F +CB4wDgYDVR0PAQH/BAQDAgPoMHkGA1UdEQRyMHCCGmNvcmUuc2xhY2t3YXJlLnVr +LmludGVybmFsgh9kaXJlY3Rvcnkuc2xhY2t3YXJlLnVrLmludGVybmFsghVjb3Jl +LnNsYWNrd2FyZS51ay5uZXSCGmRpcmVjdG9yeS5zbGFja3dhcmUudWsubmV0MBEG +CWCGSAGG+EIBAQQEAwIGQDANBgkqhkiG9w0BAQsFAAOCAgEACoI4YlU4lAgbQtmI +BLHPkzTsPSZTEdhYxhwG3Hk2sIyQ4phf5g1ibKce26OA3xA9FU4MQsLWhFnbqWt1 +9j5nGIUhE+ac0rtvbBHySKAJN+u5LlgK2K1hE1MZY+jHR8huEuryJ/e/dS4M4+lo +jOWVBR/+GNmk3FBr7HMD/rXRMcSFrMvM/5uBZw5Pnpv4B6jz+FbBRIPI+rAiRsA/ +6WzDxOIkbmn9M4qi9rPkHD+RgrtWXqMnY9yw0VM1vWg9gjL0zoxg1fyJeC1128xK +bludlYGcQ+sKGOUmvZepNMEbtygKj5M9v4Ws7lW+9Q/ZPkduXlzV7GzP5e6AxRm4 +9MrJaljR5t1w+gDD4gC6DFwneHvLNxJUqVDLK3WAFVbp8b81KkCzaIMSz32B9SVP +EbhdAS33SPdp96IodYvrPxrdhb0Ej3HVnRA2R2xPewxUcKtl8a5Uaox+zrSp3ekQ +JV55xuGdrr0cA+yo6jhy0ArQOcejA+7/QZ/4JqTBJ7evUhNmIy2sPCFVHmtNHyxv +dxIeUGeUt444jiVRahFQZBnzLUzoPTwEfZZ2F3JyZD0kWHCwzr7iirZcJXIS6Zgj +aLeboYrXi3RjGzh/O2pwbSDUeuBSHJiDNPzwQMub/iZZ89om7c+LlKlxnLDOF34g +U0dGk93TXlj6hkIEtIQyZZFUa2o= -----END CERTIFICATE----- diff --git a/etc/certificates/core.slackware.uk.internal_fullchain.pem b/etc/certificates/core.slackware.uk.internal_fullchain.pem index 4d2c2c1..286f8c0 100644 --- a/etc/certificates/core.slackware.uk.internal_fullchain.pem +++ b/etc/certificates/core.slackware.uk.internal_fullchain.pem @@ -33,7 +33,7 @@ ysEOWeSwkKq6RcYEOImxSheV4fEkkIijHVkHyJIVWDd6zHLrK68yubieUix4gbHj s03z6+RX5i2FPTk= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIFGDCCAwCgAwIBAgIIcS29cmr6vBcwDQYJKoZIhvcNAQELBQAwbzELMAkGA1UE +MIIFUDCCAzigAwIBAgIICw+43LW1El4wDQYJKoZIhvcNAQELBQAwbzELMAkGA1UE BhMCR0IxFTATBgNVBAoTDFNsYWNrd2FyZSBVSzEjMCEGA1UEAxMaU2xhY2t3YXJl IFVLIEludGVybmFsIFJvb3QxJDAiBgkqhkiG9w0BCQEWFXN5c2FkbWluQHNsYWNr d2FyZS51azAeFw0yNTAxMDEwMDAwMDBaFw00OTEyMzEyMzU5NTlaMG8xCzAJBgNV @@ -45,20 +45,21 @@ YiCdks94LGrb2lEfG89UPfGKWG9cdMSD44m6scvj7cWh9EUKvkaQ29ThuIWpx4cD UF3z4eF1Nf5cpYy89QtKsH2qsMoED5JKVKgPLX3/JQwDvJilLzgJ/vMAsx7wG9FX GDsYQyeVvIB4DLRqlNIbx76A5ZyPe7QfI/TNfqm4G1Yid0LtXkHgkd1qb5XHdGiG WBgzIM5j/N2CGI3j5CP/VK5aAzN7rnI7HM8x2W+tU2PpFkLXdMLyTBY4ATQhg4EV -K76nDVcITKD5AgMBAAGjgbcwgbQwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUxsMm +K76nDVcITKD5AgMBAAGjge8wgewwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUxsMm ZmzAaqqvGCNV8uzdWUrjx30wHwYDVR0jBBgwFoAUV7XBvimJoYCF5Ppm+4EWAKyy -CB4wDgYDVR0PAQH/BAQDAgPoMEEGA1UdEQQ6MDiCGmNvcmUuc2xhY2t3YXJlLnVr -LmludGVybmFsghpkaXIwLnNsYWNrd2FyZS51ay5pbnRlcm5hbDARBglghkgBhvhC -AQEEBAMCBkAwDQYJKoZIhvcNAQELBQADggIBAFG54lEL00l+F+KV6q3xIZCZxVZy -UoxzTRHyt7bSpoAihTmPLr19zuBAiD06hFkbMaDuSdIY87st94/Bo9Xcmsikpm5R -m1vSYcaMzzhGv/+MRT2wAKNhRUFUF/QtZr9AM8SiHL8BD9i+hRcMMglxyvfKsE0u -Ugc2CJDOXuXRG8AKiVWhW8wIUS2OzMy/NO0xA2QvA6xSsS6RYvsUBw5hWseC7x/C -+jbjscu3/YSCFAB8INvm2nPJLSpgz6iT70iJQIoB8KIZWyPCQTHbcIU/cMQKSbya -OqtMfBjejm68Ai62mffwbeC4IkTVXIujJF/Mun8wRCAFomnFsBt3ATw1pzUhj+Q0 -aD/cBvClYisL5v6v/v/4opJc7mhDZhkuYD64l4wh+can8DGGr7bsvXwUlIiKnjRu -ohDbkmESNsggWpHQcRW8M+GHc0EKbvXc6q169UksX1CJduRCFDqfPlX7FHHZiedj -uHgEe31udovVIc+eL/MQnP8qygx6kLawkeVugNgSjFEqTCeFBHaf3HRcuGalDTUc -8ApJqx0dnJyvXoIfN8OlRKYFrJ8qrJ95No94m2AiMdFC0eKlII4Ox9O8/8TsxZdA -K8KmQCRa7313s25Cd5ZbumxRF53fO19WSh550Bs6QV0HHf4gXrvshkKB3MiqCg13 -Vku0MrBK3rmY2T3F +CB4wDgYDVR0PAQH/BAQDAgPoMHkGA1UdEQRyMHCCGmNvcmUuc2xhY2t3YXJlLnVr +LmludGVybmFsgh9kaXJlY3Rvcnkuc2xhY2t3YXJlLnVrLmludGVybmFsghVjb3Jl +LnNsYWNrd2FyZS51ay5uZXSCGmRpcmVjdG9yeS5zbGFja3dhcmUudWsubmV0MBEG +CWCGSAGG+EIBAQQEAwIGQDANBgkqhkiG9w0BAQsFAAOCAgEACoI4YlU4lAgbQtmI +BLHPkzTsPSZTEdhYxhwG3Hk2sIyQ4phf5g1ibKce26OA3xA9FU4MQsLWhFnbqWt1 +9j5nGIUhE+ac0rtvbBHySKAJN+u5LlgK2K1hE1MZY+jHR8huEuryJ/e/dS4M4+lo +jOWVBR/+GNmk3FBr7HMD/rXRMcSFrMvM/5uBZw5Pnpv4B6jz+FbBRIPI+rAiRsA/ +6WzDxOIkbmn9M4qi9rPkHD+RgrtWXqMnY9yw0VM1vWg9gjL0zoxg1fyJeC1128xK +bludlYGcQ+sKGOUmvZepNMEbtygKj5M9v4Ws7lW+9Q/ZPkduXlzV7GzP5e6AxRm4 +9MrJaljR5t1w+gDD4gC6DFwneHvLNxJUqVDLK3WAFVbp8b81KkCzaIMSz32B9SVP +EbhdAS33SPdp96IodYvrPxrdhb0Ej3HVnRA2R2xPewxUcKtl8a5Uaox+zrSp3ekQ +JV55xuGdrr0cA+yo6jhy0ArQOcejA+7/QZ/4JqTBJ7evUhNmIy2sPCFVHmtNHyxv +dxIeUGeUt444jiVRahFQZBnzLUzoPTwEfZZ2F3JyZD0kWHCwzr7iirZcJXIS6Zgj +aLeboYrXi3RjGzh/O2pwbSDUeuBSHJiDNPzwQMub/iZZ89om7c+LlKlxnLDOF34g +U0dGk93TXlj6hkIEtIQyZZFUa2o= -----END CERTIFICATE----- diff --git a/etc/samba/smb.conf b/etc/samba/smb.conf index bdd6505..8ac1999 100644 --- a/etc/samba/smb.conf +++ b/etc/samba/smb.conf @@ -1,8 +1,8 @@ [global] -realm = DIR.SLACKWARE.UK.INTERNAL +realm = DIRECTORY.SLACKWARE.UK.INTERNAL netbios name = CORE workgroup = SLACKWAREUKINT -server string = "dir.slackware.uk.internal Domain Controller" +server string = "directory.slackware.uk.internal Domain Controller" # FIXME: # dns forwarder = 5.101.171.216 5.101.171.217 185.176.90.169 dns forwarder = 216.119.155.58 185.176.90.169 @@ -38,8 +38,8 @@ acl_xattr:default acl style = windows [sysvol] path = /var/lib/samba/sysvol -write list = @'Domain Admins@dir.slackware.uk.internal' +write list = @'Domain Admins@directory.slackware.uk.internal' [netlogon] -path = /var/lib/samba/sysvol/dir.slackware.uk.internal/scripts -write list = @'Domain Admins@dir.slackware.uk.internal' +path = /var/lib/samba/sysvol/directory.slackware.uk.internal/scripts +write list = @'Domain Admins@directory.slackware.uk.internal'