wip #6464 @0.5

diff --git a/.docker/config/ssh/root/known_hosts b/.docker/config/ssh/root/known_hosts
index 59c896d8f5cfd712784ac35435f259cdaef810b5..7a522a25e2736ab00f5ff6219726f7ffc3874491 100644 (file)
--- a/.docker/config/ssh/root/known_hosts
+++ b/.docker/config/ssh/root/known_hosts
@@ -54,3 +54,4 @@
 |1|EmZ7B29Ivw6vXBlnc4XgrTLl9+8=|78a+bA6zcqZqT3mcCSA7DgfgtWQ= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEKmRybFZ/yMrtKp92N7MpKSByOo4TNm1yFa96mvH4ktgxG9Iw5LdRBELGknXZO0hRkysrblSsQ6Opu/8ZOdPuo=
 |1|JzPIYF8QCrSBS4t2fVId5Ym7Kyg=|0K3icsRiZpexNkPIchHkADj+UJE= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEKmRybFZ/yMrtKp92N7MpKSByOo4TNm1yFa96mvH4ktgxG9Iw5LdRBELGknXZO0hRkysrblSsQ6Opu/8ZOdPuo=
 |1|6wykuWMhStQ5Tv99aBiqb6H+zyY=|cl+8o5TNKooA36tWnHoIAOIvV4k= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEGI/UefTFGQMkNX5fjbcI6ZIwDbOvWi0Pu2NAdrnqMI7OEHbFZ2PZdyOFkOvg+r6L989kt9xX7UDC4hb7YbFXI=
+clockwork.cubedesigners.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIANFl2JCSaJevMwQgEbkSTskRo9sEPNbPcaCURgxDu6q

diff --git a/.docker/config/ssh/user/known_hosts b/.docker/config/ssh/user/known_hosts
index c3a6e2ba7b75484f0068b41af455acc7a953f0a7..d80c746451b5c20547c3738f39dbcfaff4b198f1 100644 (file)
--- a/.docker/config/ssh/user/known_hosts
+++ b/.docker/config/ssh/user/known_hosts
@@ -58,3 +58,6 @@ kingkong.cubedesigners.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAYlGygCsICCRvgOU
 github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl
 github.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk=
 github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=
+[paris.cubedesigners.com]:22622 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFm4EKDXLwDEGP0R1Ie+K+UbM+98ECvyOdma+oASacUJ
+[paris.cubedesigners.com]:22622 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC7/de3HhC7g6KV5PCcw/2DdJUvHVu160hdUFGVq6s/bcNkt8PrS4qxl3Cc5FUFtwRmZdFeWKIC7jTJGq/PMa5HTrJcVy/VuQBuxoZv28FPxIX0Cx8pdtqtVa4L9VpyibmsNkERVTh1nfSAwVjvuHBy4WyeC/kDZsDZOAY/IDrdTE6hYhJjSW2WZXixPjBgM9lEklemokklA5KQstwkKh8mGyF9chYc3wU+Eyrb2faplSJ59BbjoV4Jh7JLzX+ttE7W/qTG2dVIcgrqwovU+RP+C/1rxmUUAyDThDj6Ug3g7oPgBj+Eo4EXq10X3LP6bkzFgV9cJc5orBsB5olWA2cUUYBOMaFO0FwClGFHsuxRo9zdvKoLUp2Dx8Q16z9sQXeBdk9W3qEVjRh1DB8smCxSrNObuqKqc36PmezPmkv/SNvD1wrEmQ/0/a9uznOoegOaW9k1lBhooxDaiQCyCO80DD/E7JDj/euRZ42qEBrxeOGCbUkPTHCXQo3glhcPAjc=
+[paris.cubedesigners.com]:22622 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBB+yTkg8a5sqFxBSLmXEPD3h/vSlNu7ptk7ZreYD85NtRtwu/+ixk87olCEG3v8iDxKoYs31PiBc/Rnu03ey/1Y=

diff --git a/bin/startup.sh b/bin/startup.sh
index 2f4439f146023b05bab9eae9201e276861080ac4..879e8620ff5cfd1ed8ed6b400085bf5bd888b0c3 100644 (file)
--- a/bin/startup.sh
+++ b/bin/startup.sh
@@ -18,6 +18,8 @@ chmod 600 /root/.ssh/id_rsa
 chmod 700 /root/.ssh/
 chmod 600 /root/.ssh/authorized_keys2
 
+chown -R root:root /etc/sudoers.d
+
 # Rsyslog
 start-stop-daemon --start -b -x /usr/sbin/rsyslogd -- -n
 

diff --git a/scripts/fixrights.sh b/scripts/fixrights.sh
index 7cc52127e29eb893901219d954e6c99a97894f57..33e1e5cea31486671947124be656bd8f31456840 100644 (file)
--- a/scripts/fixrights.sh
+++ b/scripts/fixrights.sh
@@ -1,9 +1,13 @@
 #!/bin/sh
+chown root:root /home/toolbox/www/.docker/config/sudoers
 chmod -R 755 /home/toolbox/www/scripts
 chmod -R 775 /home/toolbox/www/protected
 chmod -R 775 /home/toolbox/www/public
 chmod -R 775 /home/toolbox/www/bin
+
+chown root:root /home/toolbox/dev/.docker/config/sudoers
 chmod -R 775 /home/toolbox/dev/scripts
 chmod -R 775 /home/toolbox/dev/protected
 chmod -R 775 /home/toolbox/dev/public
 chmod -R 775 /home/toolbox/dev/bin
+