From b8918ab50037a55edf8d078c90adf608f94b6475 Mon Sep 17 00:00:00 2001
From: Cyteen May <cyteen@ring-zero.co.uk>
Date: Sat, 29 Feb 2020 11:23:34 +0000
Subject: [PATCH] Add option to turn on experimental features in daemon.json

---
 010_generate-ssh.sh | 31 +++++++++++++++++++++++++++++++
 020_docker.sh       |  7 ++++++-
 020_rox-filer.sh    |  2 ++
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/010_generate-ssh.sh b/010_generate-ssh.sh
index 9f9a625..63afade 100755
--- a/010_generate-ssh.sh
+++ b/010_generate-ssh.sh
@@ -1,13 +1,44 @@
 #!/usr/bin/env bash
 
+# FIXME: Rather just creating these files in tmp move the actions into the loop blow.
+LOCAL_USER_EMAIL=cyteen@ring-zero.co.uk
+cat > /tmp/generate-ssh-key.sh << EOF
+ssh-keygen -t rsa -b 4096 -N '' -C "${LOCAL_USER_EMAIL}" -f ~/.ssh/id_rsa
+ssh-keygen -t rsa -b 4096 -N '' -C "${LOCAL_USER_EMAIL}" -f ~/.ssh/github_rsa
+ssh-keygen -t rsa -b 4096 -N '' -C "${LOCAL_USER_EMAIL}" -f ~/.ssh/mozilla_rsa
+EOF
+
+cat > /tmp/ssh-key-add.sh << EOF
+eval "$(ssh-agent -s)"
+ssh-add ~/.ssh/id_rsa
+ssh-add ~/.ssh/github_rsa
+ssh-add ~/.ssh/mozilla_rsa
+EOF
+
+cat > /tmp/ssh-key-permissions.sh << EOF
+chmod 700 ~/.ssh
+chmod 644 ~/.ssh/authorized_keys
+chmod 644 ~/.ssh/known_hosts
+chmod 644 ~/.ssh/config
+chmod 600 ~/.ssh/id_rsa
+chmod 644 ~/.ssh/id_rsa.pub
+chmod 600 ~/.ssh/github_rsa
+chmod 644 ~/.ssh/github_rsa.pub
+chmod 600 ~/.ssh/mozilla_rsa
+chmod 644 ~/.ssh/mozilla_rsa.pub
+EOF
+
+
 DEST=/etc/skel
 cat > ${DEST}/.zprofile <<'EOF'
 
 if [ -f ${HOME}/.ssh/id_rsa.pub ]; then
+	chmod 644 ${HOME}/.ssh/id_rsa.pub
         exit 0
 else
         echo "Generating ssh keys."
 	ssh-keygen -q -t rsa -N '' -f ${HOME}/.ssh/id_rsa 2>/dev/null <<< y >/dev/null
+	chmod 644 ${HOME}/.ssh/id_rsa.pub
 fi
 EOF
 
diff --git a/020_docker.sh b/020_docker.sh
index ac548cc..5700b9b 100755
--- a/020_docker.sh
+++ b/020_docker.sh
@@ -47,10 +47,14 @@ apt-get install -y docker-ce docker-ce-cli containerd.io
 #bash -c 'sed -i "s|DOCKER_RUN_OPTS=\"\(.*\)\"|DOCKER_RUN_OPTS=\"\1 zfs.fsname=rpool/docker\"|" /etc/default/docker'
 bash -c " sed -i '/^DOCKER_RUN.*/    s/^/#/' /etc/default/docker"
 
+# enable experimental features - done in /etc/docker/daemon.json below.
+# bash -c 'sed -i "/^# Docker Upstart.*/ s/.*/&\nDOCKER_CLI_EXPERIMENTAL=enabled/" /etc/default/docker'
+bash -c " sed -i '/^DOCKER_CLI_EXPERIMENTAL=.*/    s/^/#/' /etc/default/docker"
+
 # enable buildkit builds - done in /etc/docker/daemon.json below.
 # bash -c 'sed -i "/^# Docker Upstart.*/ s/.*/&\nDOCKER_BUILDKIT=1/" /etc/default/docker'
 bash -c " sed -i '/^DOCKER_BUILDKIT.*/    s/^/#/' /etc/default/docker"
-emon
+
 # i2p container requires ipv6  - done in /etc/docker/daemon.json below.
 #bash -c 'sed -i "s|DOCKER_RUN_OPTS=\"\(.*\)\"|DOCKER_RUN_OPTS=\"\1 --ipv6\"|" /etc/default/docker'
 
@@ -98,6 +102,7 @@ DOCKER_OPT[4]='.["ipv6"] = false'
 DOCKER_OPT[5]='.["insecure-registries"] = ["soleine.lan:5000"]'
 DOCKER_OPT[6]='.["features"] = {"buildkit": true}'
 #DOCKER_OPT[7]='.["hosts"] = ["fd://","unix:///var/run/docker.sock","tcp://0.0.0.0:2376"]'
+#DOCKER_OPT[8]='.["experimental"] = "enabled"'
 
 mkdir -p ${TLS_HOME}
 ## Change the subj line to reflect you details for key generation and uncomment above to turn tls on.
diff --git a/020_rox-filer.sh b/020_rox-filer.sh
index 9f5100e..cfdb15b 100755
--- a/020_rox-filer.sh
+++ b/020_rox-filer.sh
@@ -300,6 +300,8 @@ cat > ${ROXFILER_HOME}/ROX-Filer/menus2 <<'EOF'
 EOF
 
 # Changes display_dir_colour from #000080 to #3399FF e17 blue
+
+xmlstarlet edit -L -u "/Options/Option[@name='display_file_colour']" -v '#CCCCCC' ${ROXFILER_HOME}/ROX-Filer/Options
 xmlstarlet edit -L -u "/Options/Option[@name='display_dir_colour']" -v '#3399FF' ${ROXFILER_HOME}/ROX-Filer/Options
 xmlstarlet edit -L -u "/Options/Option[@name='display_dirs_first']" -v '1' ${ROXFILER_HOME}/ROX-Filer/Options
 xmlstarlet edit -L -u "/Options/Option[@name='display_inherit_options']" -v '1' ${ROXFILER_HOME}/ROX-Filer/Options