Sync local changes.
This commit is contained in:
parent
9e8d99eade
commit
be9a73f8c1
|
|
@ -5,19 +5,12 @@ export MYLANGUAGE="en_GB.UTF-8"
|
||||||
export MYLANG="en_GB.UTF-8"
|
export MYLANG="en_GB.UTF-8"
|
||||||
export MYLC_ALL="en_GB.UTF-8"
|
export MYLC_ALL="en_GB.UTF-8"
|
||||||
|
|
||||||
# /etc/environment deprecated
|
|
||||||
#echo "LANGUAGE="${MYLANGUAGE}"" > /etc/environment
|
|
||||||
#echo "LANG="${MYLANG}"" >> /etc/environment
|
|
||||||
#echo "LC_ALL="${MYLC_ALL}"" >> /etc/environment
|
|
||||||
|
|
||||||
echo "Europe/London" > /etc/timezone
|
echo "Europe/London" > /etc/timezone
|
||||||
sed -i -e "s/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/" /etc/locale.gen
|
sed -i -e "s/# ${MYLANG}\ UTF-8/${MYLANG}\ UTF-8/" /etc/locale.gen
|
||||||
#sed -i -e "s/# ${MYLANG} UTF-8/${MYLANG} UTF-8/" /etc/locale.
|
update-locale LANG=${MYLANG}
|
||||||
sed -i -e "s/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/" /etc/locale.gen
|
|
||||||
echo LANG="${MYLANG}">/etc/default/locale
|
|
||||||
dpkg-reconfigure --frontend=noninteractive locales
|
dpkg-reconfigure --frontend=noninteractive locales
|
||||||
export LANGUAGE="en_GB.UTF-8"
|
|
||||||
export LANG="en_GB.UTF-8"
|
export LANGUAGE="${MYLANGUAGE}"
|
||||||
#export LC_ALL="en_GB.UTF-8"
|
export LANG="${MYLANG}"
|
||||||
#update-locale LANG=${MYLANG}
|
export LC_ALL="${MYLC_ALL}"
|
||||||
update-locale LANG=en_GB.UTF-8
|
|
||||||
|
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
ZZ_VERSION=0.17.0
|
|
||||||
cd /var/tmp
|
|
||||||
wget -c https://github.com/oetiker/znapzend/releases/download/v${ZZ_VERSION}/znapzend-${ZZ_VERSION}.tar.gz
|
|
||||||
tar zxvf znapzend-${ZZ_VERSION}.tar.gz
|
|
||||||
cd znapzend-${ZZ_VERSION}
|
|
||||||
./configure --prefix=/opt/znapzend-${ZZ_VERSION}
|
|
||||||
make
|
|
||||||
checkinstall --fstrans=no bash -c 'make install && for x in /opt/znapzend-0.17.0/bin/*; do ln -s $x /usr/local/bin; done'
|
|
||||||
|
|
||||||
# rm -rf znapzend-${ZZ_VERSION}
|
|
||||||
|
|
@ -1,7 +1,9 @@
|
||||||
# Install docker
|
# Install docker
|
||||||
|
set -x
|
||||||
|
echo '#sudo bash -c "apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D"' > /etc/apt/sources.list.d/docker.list
|
||||||
|
echo "deb http://apt.dockerproject.org/repo debian-jessie main" >> /etc/apt/sources.list.d/docker.list
|
||||||
|
|
||||||
#sudo bash -c "apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D"
|
sudo bash -c "apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D"
|
||||||
|
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get -y install -q --no-install-recommends curl ca-certificates
|
sudo apt-get -y install -q --no-install-recommends curl ca-certificates
|
||||||
sudo apt-get -y install --force-yes docker-engine
|
sudo apt-get -y install --force-yes docker-engine
|
||||||
|
|
@ -11,13 +13,13 @@ sudo apt-get -y install --force-yes docker-engine
|
||||||
#sudo umount /dev/mapper/vg_prime-varLibDockerLV
|
#sudo umount /dev/mapper/vg_prime-varLibDockerLV
|
||||||
#sudo mount /dev/mapper/vg_prime-varLibDockerLV /var/lib/docker
|
#sudo mount /dev/mapper/vg_prime-varLibDockerLV /var/lib/docker
|
||||||
|
|
||||||
sudo bash -c `perl -p -i -e 's/#DOCKER_OPTS=""/DOCKER_OPTS="--restart=true"/g' /etc/default/docker`
|
sudo bash -c 'perl -p -i -e "s/#DOCKER_OPTS=\"\"/DOCKER_OPTS=\"--restart=true\"/g" /etc/default/docker'
|
||||||
sudo bash -c `sed -i "s/DOCKER_OPTS=\"\(.*\)\"/DOCKER_OPTS=\"\1 --storage-driver=zfs\"/" /etc/default/docker`
|
sudo bash -c 'sed -i "s|DOCKER_OPTS=\"\(.*\)\"|DOCKER_OPTS=\"\1 --storage-driver=zfs\"|" /etc/default/docker'
|
||||||
sudo bash -c `sed -i "s/DOCKER_OPTS=\"\(.*\)\"/DOCKER_OPTS=\"\1 --dns 8.8.8.8 --dns 8.8.4.4\"/" /etc/default/docker`
|
sudo bash -c 'sed -i "s|DOCKER_OPTS=\"\(.*\)\"|DOCKER_OPTS=\"\1 --dns 8.8.8.8 --dns 8.8.4.4\"|" /etc/default/docker'
|
||||||
sudo bash -c `sed -i "s/DOCKER_OPTS=\"\(.*\)\"/DOCKER_OPTS=\"\1 zfs.fsname=rpool/docker\"/" /etc/default/docker`
|
sudo bash -c 'sed -i "s|DOCKER_OPTS=\"\(.*\)\"|DOCKER_OPTS=\"\1 zfs.fsname=rpool/docker\"|" /etc/default/docker'
|
||||||
|
|
||||||
# i2p container requires ipv6
|
# i2p container requires ipv6
|
||||||
sudo bash -c `sed -i "s/DOCKER_OPTS=\"\(.*\)\"/DOCKER_OPTS=\"\1 --ipv6\"/" /etc/default/docker`
|
sudo bash -c 'sed -i "s|DOCKER_OPTS=\"\(.*\)\"|DOCKER_OPTS=\"\1 --ipv6\"|" /etc/default/docker'
|
||||||
|
|
||||||
# The above can also be passed in /etc/docker/daemon.json
|
# The above can also be passed in /etc/docker/daemon.json
|
||||||
# For other options:
|
# For other options:
|
||||||
|
|
@ -42,48 +44,48 @@ for ((i = 0; i < ${#DOCKER_OPT[@]}; ++i)); do
|
||||||
done
|
done
|
||||||
|
|
||||||
# General options
|
# General options
|
||||||
# Adding a personal registry.
|
## Adding a personal registry.
|
||||||
DOCKER_OPT[0]='.["insecure-registries"] = ["mydocker-registry.net:5000"]'
|
#DOCKER_OPT[0]='.["insecure-registries"] = ["mydocker-registry.net:5000"]'
|
||||||
# Allow live restore, keep containers alive when the daemon becomes unavailable.
|
## Allow live restore, keep containers alive when the daemon becomes unavailable.
|
||||||
# Not compatible with swarm mode.
|
## Not compatible with swarm mode.
|
||||||
DOCKER_OPT[1]='.["live-restore"] = ["true"]'
|
#DOCKER_OPT[1]='.["live-restore"] = ["true"]'
|
||||||
# Debugging on
|
## Debugging on
|
||||||
DOCKER_OPT[2]='.["debug"] = ["true"]'
|
#DOCKER_OPT[2]='.["debug"] = ["true"]'
|
||||||
# IPv6 for i2p container
|
## IPv6 for i2p container
|
||||||
DOCKER_OPT[3]='["ipv6"] = ["true"]'
|
#DOCKER_OPT[3]='.["ipv6"] = ["true"]'
|
||||||
# Logging options
|
## Logging options
|
||||||
DOCKER_OPT[4]='.["log-driver"] = ["syslog"]'
|
#DOCKER_OPT[4]='.["log-driver"] = ["syslog"]'
|
||||||
#DOCKER_OPT[4]='.["log-opts"] = ["syslog-address","udp://1.2.3.4:1111"]'
|
##DOCKER_OPT[4]='.["log-opts"] = ["syslog-address","udp://1.2.3.4:1111"]'
|
||||||
|
#
|
||||||
for ((i = 0; i < ${#DOCKER_OPT[@]}; ++i)); do
|
#for ((i = 0; i < ${#DOCKER_OPT[@]}; ++i)); do
|
||||||
OPTION="${DOCKER_OPT[$i]}"
|
# OPTION="${DOCKER_OPT[$i]}"
|
||||||
jq "${OPTION}" /etc/docker/daemon.json > /tmp/daemon.json.new && \
|
# jq "${OPTION}" /etc/docker/daemon.json > /tmp/daemon.json.new && \
|
||||||
mv -b /tmp/daemon.json.new /etc/docker/daemon.json
|
# mv -b /tmp/daemon.json.new /etc/docker/daemon.json
|
||||||
done
|
#done
|
||||||
|
|
||||||
# Add tls - we keep the keys on the docker zfs dataset not /etc/docker/tls
|
# Add tls - we keep the keys on the docker zfs dataset not /etc/docker/tls
|
||||||
DOCKER_OPT[0]='.["tls"] = ["true"]'
|
#DOCKER_OPT[0]='.["tls"] = ["true"]'
|
||||||
DOCKER_OPT[1]='.["tlscacert"] = ["/var/lib/docker/ca.pem"]'
|
#DOCKER_OPT[1]='.["tlscacert"] = ["/var/lib/docker/ca.pem"]'
|
||||||
DOCKER_OPT[2]='/["tlscert"] = ["/var/lib/docker/server.pem"]'
|
#DOCKER_OPT[2]='.["tlscert"] = ["/var/lib/docker/server.pem"]'
|
||||||
DOCKER_OPT[3]='.["tlskey"] = ["/var/lib/docker/serverkey.pem"]'
|
#DOCKER_OPT[3]='.["tlskey"] = ["/var/lib/docker/serverkey.pem"]'
|
||||||
DOCKER_OPT[4]='.["tlsverify"] = ["true"]'
|
#DOCKER_OPT[4]='.["tlsverify"] = ["true"]'
|
||||||
DOCKER_OPT[5]='.["hosts"] = ["tcp://192.168.59.3:2376"]'
|
#DOCKER_OPT[5]='.["hosts"] = ["tcp://192.168.59.3:2376"]'
|
||||||
|
|
||||||
for ((i = 0; i < ${#DOCKER_OPT[@]}; ++i)); do
|
#for ((i = 0; i < ${#DOCKER_OPT[@]}; ++i)); do
|
||||||
OPTION="${DOCKER_OPT[$i]}"
|
# OPTION="${DOCKER_OPT[$i]}"
|
||||||
jq "${OPTION}" /etc/docker/daemon.json > /tmp/daemon.json.new && \
|
# jq "${OPTION}" /etc/docker/daemon.json > /tmp/daemon.json.new && \
|
||||||
mv -b /tmp/daemon.json.new /etc/docker/daemon.json
|
# mv -b /tmp/daemon.json.new /etc/docker/daemon.json
|
||||||
done
|
#done
|
||||||
|
|
||||||
# Something similar to set up a swarm
|
## Something similar to set up a swarm
|
||||||
DOCKER_OPT[0]='.["cluster-advertise"] = "192.168.1.116:12376"'
|
#DOCKER_OPT[0]='.["cluster-advertise"] = "192.168.1.116:12376"'
|
||||||
DOCKER_OPT[1]='.["cluster-store"] = "etcd://192.168.1.116:12379"'
|
#DOCKER_OPT[1]='.["cluster-store"] = "etcd://192.168.1.116:12379"'
|
||||||
DOCKER_OPT[2]='.["cluster-store-opts"] = { "kv.cacertfile" : "/var/lib/docker/discovery_certs/ca.pem", "kv.certfile" : "/var/lib/docker/discovery_certs/cert.pem", "kv.keyfile" : "/var/lib/docker/discovery_certs/key.pem" }'
|
#DOCKER_OPT[2]='.["cluster-store-opts"] = { "kv.cacertfile" : "/var/lib/docker/discovery_certs/ca.pem", "kv.certfile" : "/var/lib/docker/discovery_certs/cert.pem", "kv.keyfile" : "/var/lib/docker/discovery_certs/key.pem" }'
|
||||||
for ((i = 0; i < ${#DOCKER_OPT[@]}; ++i)); do
|
#for ((i = 0; i < ${#DOCKER_OPT[@]}; ++i)); do
|
||||||
OPTION="${DOCKER_OPT[$i]}"
|
# OPTION="${DOCKER_OPT[$i]}"
|
||||||
jq "${OPTION}" /etc/docker/daemon.json > /tmp/daemon.json.new && \
|
# jq "${OPTION}" /etc/docker/daemon.json > /tmp/daemon.json.new && \
|
||||||
mv -b /tmp/daemon.json.new /etc/docker/daemon.json
|
# mv -b /tmp/daemon.json.new /etc/docker/daemon.json
|
||||||
done
|
#done
|
||||||
|
|
||||||
sudo /etc/init.d/docker restart
|
sudo /etc/init.d/docker restart
|
||||||
#sudo dpkg -i /var/tmp/docker-compose/docker-compose_1.11.0-1_amd64.deb
|
#sudo dpkg -i /var/tmp/docker-compose/docker-compose_1.11.0-1_amd64.deb
|
||||||
|
|
@ -133,4 +135,4 @@ set +x
|
||||||
curl -o /usr/local/bin/docker-compose -L https://api.github.com/repos/docker/compose/releases/latest && chmod +x /usr/local/bin/docker-compose
|
curl -o /usr/local/bin/docker-compose -L https://api.github.com/repos/docker/compose/releases/latest && chmod +x /usr/local/bin/docker-compose
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
sudo bash -c ./checkinstall_it.sh
|
sudo bash ./checkinstall_it.sh
|
||||||
|
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
cat > /etc/sysctl.d/01-elastic.conf << 'EOF'
|
|
||||||
vm.max_map_count=262144
|
|
||||||
vm.swappiness = 1
|
|
||||||
EOF
|
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
# https://unetbootin.github.io/linux_download.html
|
||||||
|
|
||||||
|
#sudo add-apt-repository ppa:gezakovacs/ppa
|
||||||
|
#sudo apt-get update
|
||||||
|
#sudo apt-get install unetbootin
|
||||||
|
|
||||||
|
cd /var/tmp
|
||||||
|
wget -c https://github.com/unetbootin/unetbootin/releases/download/655/unetbootin-linux64-655.bin
|
||||||
|
chmod +x ./unetbootin-linux-*
|
||||||
|
apt-get install p7zip-full
|
||||||
|
./unetbootin-linux-*
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# thunderbird/icedove extensions
|
# thunderbird/icedove extensions
|
||||||
sudo apt-get -y install xul-ext-tbdialout
|
#sudo apt-get -y install xul-ext-tbdialout
|
||||||
# https://doc.owncloud.org/server/5.0/user_manual/pim/sync_thunderbird.html
|
# https://doc.owncloud.org/server/5.0/user_manual/pim/sync_thunderbird.html
|
||||||
sudo apt-get -y install xul-ext-sogo-connector
|
#sudo apt-get -y install xul-ext-sogo-connector
|
||||||
sudo apt-get -y install xul-ext-firetray
|
sudo apt-get -y install xul-ext-firetray
|
||||||
sudo apt-get -y install iceowl-extension
|
#sudo apt-get -y install iceowl-extension
|
||||||
|
|
|
||||||
|
|
@ -1 +1,2 @@
|
||||||
|
# From the people who thought bash scripts in init.d were too complicated we get javascript snipits and xml based configuration files to set permissions, just say no.
|
||||||
sudo apt-get -y remove --purge policykit-1
|
sudo apt-get -y remove --purge policykit-1
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,14 @@
|
||||||
RELEASE=unstable
|
LOGNAME=${USER}
|
||||||
|
RELEASE=$(cat /etc/devuan_version)
|
||||||
KEYRING=/usr/share/keyrings/devuan-archive-keyring.gpg
|
KEYRING=/usr/share/keyrings/devuan-archive-keyring.gpg
|
||||||
INCLUDE="eatmydata,ccache,gnupg"
|
INCLUDE="eatmydata,ccache,gnupg"
|
||||||
MIRROR=http://auto.mirror.devuan.org/merged
|
MIRROR=http://auto.mirror.devuan.org/merged
|
||||||
|
|
||||||
|
sudo apt-get install -y sbuild
|
||||||
|
sudo mkdir -p /root/.gnupg # To work around #792100
|
||||||
|
sudo sbuild-update --keygen # see #801798
|
||||||
|
sudo sbuild-adduser ${LOGNAME}
|
||||||
|
sudo usermod -g sbuild ${LOGNAME}
|
||||||
|
`newgrp sbuild`
|
||||||
|
|
||||||
sudo sbuild-createchroot --keyring=${KEYRING} --include=${INCLUDE} ${RELEASE} /srv/chroot/${RELEASE}-amd64-sbuild ${MIRROR}
|
sudo sbuild-createchroot --keyring=${KEYRING} --include=${INCLUDE} ${RELEASE} /srv/chroot/${RELEASE}-amd64-sbuild ${MIRROR}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue