Add Artful (#151)
* Refresh Artful * Refresh Vundle * Add veracrypt dependencies * Add the current user to the docker group * Test on more modern OSes * Fix the name of the test script * Fix empty user on Ubuntu
This commit is contained in:
parent
eed03ba291
commit
d12306e66b
6 changed files with 37 additions and 30 deletions
|
@ -12,12 +12,10 @@ matrix:
|
|||
osx_image: xcode9.1
|
||||
- os: linux
|
||||
env: DETECTED_OS=fedora:27 DOCKER_IMAGE=cyplo/fedora27_base
|
||||
- os: linux
|
||||
env: DETECTED_OS=fedora:26 DOCKER_IMAGE=cyplo/fedora26_base
|
||||
- os: linux
|
||||
env: DETECTED_OS=debian:jessie DOCKER_IMAGE=cyplo/jessie_base
|
||||
- os: linux
|
||||
env: DETECTED_OS=ubuntu:zesty DOCKER_IMAGE=cyplo/zesty_base
|
||||
env: DETECTED_OS=ubuntu:artful DOCKER_IMAGE=cyplo/artful_base
|
||||
script:
|
||||
- ./test.sh
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 6437ad6df4a3e6a87c5fb8bd2b8aadb277ec9c87
|
||||
Subproject commit fcc204205e3305c4f86f07e09cd756c7d06f0f00
|
|
@ -58,6 +58,8 @@ if [[ -z $NO_SYSTEMCTL ]]; then
|
|||
sudo systemctl restart dnf-automatic-install.timer
|
||||
sudo systemctl enable fstrim.timer
|
||||
sudo systemctl restart fstrim.timer
|
||||
systemctl enable syncthing@cyryl.service
|
||||
systemctl restart syncthing@cyryl.service
|
||||
sudo systemctl list-timers
|
||||
fi
|
||||
|
||||
|
|
|
@ -1,25 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
set -v
|
||||
|
||||
sudo apt-get update
|
||||
sudo apt-get -y upgrade
|
||||
install_packages="sudo apt-get -y --fix-missing install apt-file aptitude aria2 atop cmake curl dkms freecad gajim git glances gnupg2 golang gparted gsmartcontrol gtk-redshift intltool kdiff3 keepass2 libatk1.0-dev libbonoboui2-dev libcairo2-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libncurses5-dev libx11-dev libxpm-dev libxt-dev linux-kernel-headers lm-sensors meld mercurial nodejs npm pv python-dev python-pip python3-pip realpath redshift retext ruby-dev silversearcher-ag solaar terminator thunderbird thunderbird-enigmail thunderbird-ublock-origin tmux tor torsocks vim whois zsh dirmngr"
|
||||
|
||||
set +e
|
||||
for i in `seq 1 3`; do
|
||||
eval $install_packages
|
||||
done
|
||||
|
||||
set -e
|
||||
eval $install_packages
|
||||
|
||||
if [[ -z $NO_SYSTEMCTL ]]; then
|
||||
sudo systemctl enable tor
|
||||
sudo systemctl start tor
|
||||
fi
|
||||
|
||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
DIR="$DIR/../"
|
||||
DIR="$DIR" $DIR/common/configure_fresh_system.sh
|
|
@ -15,5 +15,5 @@ cd $HOME
|
|||
mkdir -p dev/
|
||||
cp -rv temp/dotfiles dev/
|
||||
|
||||
./dev/dotfiles/ubuntu/configure_fresh_system.sh
|
||||
./dev/dotfiles/ubuntu/up.sh
|
||||
|
||||
|
|
32
ubuntu/up.sh
Executable file
32
ubuntu/up.sh
Executable file
|
@ -0,0 +1,32 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
set -v
|
||||
|
||||
sudo apt-get update
|
||||
sudo apt-get -y upgrade
|
||||
sudo apt-get -y --fix-missing install apt-file aptitude aria2 atop cmake curl dkms freecad gajim git glances gnupg2 golang gparted gsmartcontrol intltool kdiff3 keepass2 libatk1.0-dev libbonoboui2-dev libcairo2-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libncurses5-dev libx11-dev libxpm-dev libxt-dev linux-kernel-headers lm-sensors meld mercurial nodejs npm pv python-dev python-pip python3-pip realpath retext ruby-dev silversearcher-ag solaar terminator tmux vim whois zsh dirmngr fail2ban glances atop syncthing evolution docker.io yasm libfuse-dev libwxgtk3.0-dev net-tools
|
||||
|
||||
if [[ -z $USER ]]; then
|
||||
USER=`whoami`
|
||||
fi
|
||||
|
||||
sudo usermod -aG docker $USER
|
||||
|
||||
curl -s https://syncthing.net/release-key.txt | sudo apt-key add -
|
||||
echo "deb https://apt.syncthing.net/ syncthing stable" | sudo tee /etc/apt/sources.list.d/syncthing.list
|
||||
sudo apt-get -y install syncthing
|
||||
|
||||
if [[ -z $NO_SYSTEMCTL ]]; then
|
||||
sudo systemctl enable docker
|
||||
sudo systemctl restart docker
|
||||
sudo systemctl enable fail2ban
|
||||
sudo systemctl restart fail2ban
|
||||
echo "Enabling Syncthing for $USER"
|
||||
sudo systemctl enable syncthing@$USER.service
|
||||
sudo systemctl restart syncthing@$USER.service
|
||||
fi
|
||||
|
||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
DIR="$DIR/../"
|
||||
DIR="$DIR" $DIR/common/configure_fresh_system.sh
|
Loading…
Reference in a new issue