From d12306e66b7f0d22172192eb8930be0b59da981a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 3 Dec 2017 09:51:58 +0000 Subject: [PATCH] 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 --- .travis.yml | 4 +--- .vim/bundle/Vundle.vim | 2 +- fedora/up.sh | 2 ++ ubuntu/configure_fresh_system.sh | 25 ------------------------- ubuntu/test_insider | 2 +- ubuntu/up.sh | 32 ++++++++++++++++++++++++++++++++ 6 files changed, 37 insertions(+), 30 deletions(-) delete mode 100755 ubuntu/configure_fresh_system.sh create mode 100755 ubuntu/up.sh diff --git a/.travis.yml b/.travis.yml index 44c42917..ce943f4b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/.vim/bundle/Vundle.vim b/.vim/bundle/Vundle.vim index 6437ad6d..fcc20420 160000 --- a/.vim/bundle/Vundle.vim +++ b/.vim/bundle/Vundle.vim @@ -1 +1 @@ -Subproject commit 6437ad6df4a3e6a87c5fb8bd2b8aadb277ec9c87 +Subproject commit fcc204205e3305c4f86f07e09cd756c7d06f0f00 diff --git a/fedora/up.sh b/fedora/up.sh index e0fa0d86..8d65e15d 100755 --- a/fedora/up.sh +++ b/fedora/up.sh @@ -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 diff --git a/ubuntu/configure_fresh_system.sh b/ubuntu/configure_fresh_system.sh deleted file mode 100755 index 830b301d..00000000 --- a/ubuntu/configure_fresh_system.sh +++ /dev/null @@ -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 diff --git a/ubuntu/test_insider b/ubuntu/test_insider index f8f384f4..9780e69b 100755 --- a/ubuntu/test_insider +++ b/ubuntu/test_insider @@ -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 diff --git a/ubuntu/up.sh b/ubuntu/up.sh new file mode 100755 index 00000000..9411b0a7 --- /dev/null +++ b/ubuntu/up.sh @@ -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