From 7baee36853d0fae399a951918c2b8ebe4e6da6a8 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 20 Jan 2014 22:43:12 +0100 Subject: refactor vim configuration --- ship/src/vim_sane_defaults | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 ship/src/vim_sane_defaults (limited to 'ship/src') diff --git a/ship/src/vim_sane_defaults b/ship/src/vim_sane_defaults new file mode 100644 index 00000000..eb8c4c5d --- /dev/null +++ b/ship/src/vim_sane_defaults @@ -0,0 +1,11 @@ +#!/bin/sh +#@strict +#@include core +#@include vim +#@punani +#@mainifyme +info "installing punani" +punani install vim +touch $vimrc +info "configuring vim" +vim_conf_sane_defaults -- cgit v1.2.3 From a774db6b3d89a106689fb1365f65b4a49c2dedec Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 20 Jan 2014 22:45:54 +0100 Subject: ship fix typo --- ship/src/vim_sane_defaults | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ship/src') diff --git a/ship/src/vim_sane_defaults b/ship/src/vim_sane_defaults index eb8c4c5d..4c6f1b8f 100644 --- a/ship/src/vim_sane_defaults +++ b/ship/src/vim_sane_defaults @@ -2,7 +2,7 @@ #@strict #@include core #@include vim -#@punani +#@include punani #@mainifyme info "installing punani" punani install vim -- cgit v1.2.3 From f46851de1af7c044471523c40e0fe88579b8a997 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 20 Feb 2014 18:50:20 +0100 Subject: add proposal for find-supers this script may be used when bootstrapping new retiolum nodes --- ship/src/find-supers-tinc | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 ship/src/find-supers-tinc (limited to 'ship/src') diff --git a/ship/src/find-supers-tinc b/ship/src/find-supers-tinc new file mode 100644 index 00000000..edbb5a7b --- /dev/null +++ b/ship/src/find-supers-tinc @@ -0,0 +1,6 @@ +#!/bin/sh +#@include core +#@include retiolum + +find_supernodes | cut -d\ -f 1 | shuf | head -n 5 \ + | xargs -n1 printf "ConnectTo=%s\n" -- cgit v1.2.3 From 1046da40ddc283cdec9d3156ecd6a37117c083cf Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 21 Feb 2014 13:23:05 +0100 Subject: add //ship/src/refresh-supers this script updates the currently configured supernodes in /etc/tinc/retiolum/tinc.conf with 5 random working supernodes in the retiolum darknet. The tinc.conf file can be given via environment. the hosts should be up-to-date in order to find all available supernodes. --- ship/src/find-supers-tinc | 4 ++-- ship/src/refresh-supers | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 ship/src/refresh-supers (limited to 'ship/src') diff --git a/ship/src/find-supers-tinc b/ship/src/find-supers-tinc index edbb5a7b..3ea53d35 100644 --- a/ship/src/find-supers-tinc +++ b/ship/src/find-supers-tinc @@ -1,6 +1,6 @@ #!/bin/sh +#@info #@include core #@include retiolum -find_supernodes | cut -d\ -f 1 | shuf | head -n 5 \ - | xargs -n1 printf "ConnectTo=%s\n" +find_supernodes diff --git a/ship/src/refresh-supers b/ship/src/refresh-supers new file mode 100644 index 00000000..26909a94 --- /dev/null +++ b/ship/src/refresh-supers @@ -0,0 +1,26 @@ +#!/bin/sh +#@info +# usage: [DEBUG=1] [tincconf=/not/tinc/retiolum/tinc.conf] $0 +#@include core +#@include retiolum + # using find_supernodes + # tinc_path + # netname + +#@strict +#@mainifyme + +max_connect_to=${max_connect_to:-5} +tincconf=${tincconf:-$tinc_path/$netname/tinc.conf} +tmp_tincconf=$(mktemp) +defer "rm -f $tmp_tincconf" + +sed '/[ ]*ConnectTo=/d' "$tincconf" > "$tmp_tincconf" + +find_supernodes | cut -d\ -f 1 | shuf \ + | head -n "${max_connect_to}" \ + | xargs -n1 printf "ConnectTo=%s\n" >> "$tmp_tincconf" + +info "replacing old tinc.conf with one" +test "${DEBUG:-}" && diff "$tincconf" "$tmp_tincconf" +mv "$tmp_tincconf" "$tincconf" -- cgit v1.2.3 From d818d26256380d1be91cb3d449271da96adb2105 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 26 Feb 2014 22:53:35 +0100 Subject: implement IRC proposal to refresh supernodes //ship/src/refresh-supers is the script which will update your tinc config and choose 5 working supernodes for you to connect to. This proposal may become part of the tinc.krebsco.de install script --- ship/src/refresh-super-keys | 5 +++++ ship/src/refresh-supers | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 ship/src/refresh-super-keys (limited to 'ship/src') diff --git a/ship/src/refresh-super-keys b/ship/src/refresh-super-keys new file mode 100644 index 00000000..dddbe846 --- /dev/null +++ b/ship/src/refresh-super-keys @@ -0,0 +1,5 @@ +#!/bin/sh +#@info +#@include retiolum +#@mainifyme +refresh_supernode_keys diff --git a/ship/src/refresh-supers b/ship/src/refresh-supers index 26909a94..af31a5df 100644 --- a/ship/src/refresh-supers +++ b/ship/src/refresh-supers @@ -1,6 +1,9 @@ #!/bin/sh #@info # usage: [DEBUG=1] [tincconf=/not/tinc/retiolum/tinc.conf] $0 +# This is the implementation of the proposal how to update tinc supernode +# connections + #@include core #@include retiolum # using find_supernodes @@ -10,12 +13,14 @@ #@strict #@mainifyme +refresh_supernode_keys + max_connect_to=${max_connect_to:-5} tincconf=${tincconf:-$tinc_path/$netname/tinc.conf} tmp_tincconf=$(mktemp) defer "rm -f $tmp_tincconf" -sed '/[ ]*ConnectTo=/d' "$tincconf" > "$tmp_tincconf" +sed '/^[ ]*ConnectTo/d' "$tincconf" > "$tmp_tincconf" find_supernodes | cut -d\ -f 1 | shuf \ | head -n "${max_connect_to}" \ @@ -24,3 +29,5 @@ find_supernodes | cut -d\ -f 1 | shuf \ info "replacing old tinc.conf with one" test "${DEBUG:-}" && diff "$tincconf" "$tmp_tincconf" mv "$tmp_tincconf" "$tincconf" + +tinc_reload -- cgit v1.2.3 From 43fb2f1208c45ae97002d61e131b40161709fbcf Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 26 Feb 2014 23:21:10 +0100 Subject: fix typo in //ship/src/refresh-supers --- ship/src/refresh-supers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ship/src') diff --git a/ship/src/refresh-supers b/ship/src/refresh-supers index af31a5df..a35e2229 100644 --- a/ship/src/refresh-supers +++ b/ship/src/refresh-supers @@ -30,4 +30,4 @@ info "replacing old tinc.conf with one" test "${DEBUG:-}" && diff "$tincconf" "$tmp_tincconf" mv "$tmp_tincconf" "$tincconf" -tinc_reload +reload_tinc -- cgit v1.2.3 From b201fb5074cb38ce713fce42b97cf6e23b5c7e79 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 28 Feb 2014 01:58:48 +0100 Subject: update makefu env bootstrapping --- ship/src/bootstrap_env_makefu | 51 +++++-------------------------------------- 1 file changed, 6 insertions(+), 45 deletions(-) (limited to 'ship/src') diff --git a/ship/src/bootstrap_env_makefu b/ship/src/bootstrap_env_makefu index 7ec59a79..44148665 100755 --- a/ship/src/bootstrap_env_makefu +++ b/ship/src/bootstrap_env_makefu @@ -4,6 +4,9 @@ #@strict #@include core #@include punani +#@include vim +#@mainifyme + info "Configuring environment for $(id -un)" cd $(readlink -f $(dirname $0)) info "Using punani to install git vim and zsh" @@ -68,43 +71,22 @@ mkdir -p $HOME/.vim # TODO modilarize vimconfig cat > $HOME/.vim/vimrc < -nnoremap -vnoremap " pasting nnoremap :set invpaste paste? set pastetoggle= @@ -114,34 +96,13 @@ set showmode au FocusLost * :wa set spelllang=en -" use set spell to enable spelling - -" press ttt to rot16 the whole file -nmap ttt ggg?G - -colorscheme darkblue -set background=dark -set number -set mouse= set textwidth=9001 -set ignorecase -set incsearch -set wildignore=*.o,*.obj,*.bak,*.exe,*.os - -set shiftwidth=2 -set tabstop=2 -set et -set sw=2 -set smarttab -set autoindent -" end tabstop -set backspace=indent,eol,start -set nocp autocmd BufRead *.json set filetype=json EOF ln -vs $HOME/.vim/vimrc $HOME/.vimrc +vim_conf_sane_defaults #install all the vim stuff with the help of vundle cd $HOME/.vim -- cgit v1.2.3 From fb75532f8ac05761955ea25ed0d00ce66a6567db Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 7 Mar 2014 14:25:40 +0100 Subject: update env-bootstrapping --- ship/src/bootstrap_env_makefu | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) (limited to 'ship/src') diff --git a/ship/src/bootstrap_env_makefu b/ship/src/bootstrap_env_makefu index 44148665..6c75cd57 100755 --- a/ship/src/bootstrap_env_makefu +++ b/ship/src/bootstrap_env_makefu @@ -5,12 +5,23 @@ #@include core #@include punani #@include vim + +# vim +python +_punanidb_pacman_vim_python=gvim +_punanidb_yum_vim_python=vim-enhanced +_punanidb_aptget_vim_python=vim + +# TODO pull out youcompleteme into a vim function +# cmake ,make,g++,python-dev for youcompleteme +_punanidb_pacman_cmake=cmake +_punanidb_yum_cmake=cmake +_punanidb_aptget_cmake=cmake #@mainifyme info "Configuring environment for $(id -un)" cd $(readlink -f $(dirname $0)) info "Using punani to install git vim and zsh" -punani install git vim zsh || error "cannot install some shit" +punani install git vim_python zsh gpp cmake make python2_dev || die "cannot install some shit" info "writing dotfiles" # deploying zshrc @@ -100,19 +111,27 @@ set spelllang=en set textwidth=9001 autocmd BufRead *.json set filetype=json EOF - +if [ -e $HOME/.vimrc ] ; then + oldvim=$HOME/.vimrc.`date +%Y%M%d` + info "Backing up old vimrc file to $oldvim" + mv -v $HOME/.vimrc $oldvim +fi +info "Symlinking .vimrc to .vim/vimrc" ln -vs $HOME/.vim/vimrc $HOME/.vimrc vim_conf_sane_defaults #install all the vim stuff with the help of vundle cd $HOME/.vim -mkdir bundle -mkdir backup +mkdir -p bundle info "Fetching vim-vundle" git clone https://github.com/gmarik/vundle.git bundle/vundle > /dev/null && \ info "Vim Vundle deployed" info "Installing Vundle Bundles" vim "+:BundleInstall" "+:qall" + +info "building youcompleteme libs" +cd $HOME/.vim/bundle/YouCompleteMe +./install.sh cd - info "configuring zsh" -- cgit v1.2.3 From e0a6751890271e073f756cabdf1b9bcdb068712e Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 7 Mar 2014 16:04:34 +0100 Subject: unfix all the docker tests, sorry :( --- ship/src/refresh-supers | 2 ++ 1 file changed, 2 insertions(+) (limited to 'ship/src') diff --git a/ship/src/refresh-supers b/ship/src/refresh-supers index a35e2229..6dc6e8ab 100644 --- a/ship/src/refresh-supers +++ b/ship/src/refresh-supers @@ -22,6 +22,8 @@ defer "rm -f $tmp_tincconf" sed '/^[ ]*ConnectTo/d' "$tincconf" > "$tmp_tincconf" + +# TODO find_supernodes requires netcat find_supernodes | cut -d\ -f 1 | shuf \ | head -n "${max_connect_to}" \ | xargs -n1 printf "ConnectTo=%s\n" >> "$tmp_tincconf" -- cgit v1.2.3 From fc166354da369e4a9e3e635d5026ecf4f8ee11f4 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 9 Mar 2014 21:44:17 +0100 Subject: ship:/lib/filehooker set nick --- ship/src/filehooker_install | 118 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) create mode 100755 ship/src/filehooker_install (limited to 'ship/src') diff --git a/ship/src/filehooker_install b/ship/src/filehooker_install new file mode 100755 index 00000000..108f2421 --- /dev/null +++ b/ship/src/filehooker_install @@ -0,0 +1,118 @@ +#/bin/sh +#@strict +#@include core +#@include color +#@include network +#@include filehooker +pass=lolwut.aidsballs +admin=pimp +extra_pkg="vim sudo grub-bios ntp tor openssh btrfs-progs tmux" + +info "writing stdout to /tmp/install.log" + + +rootdisk=${1?please provide the root disk via \$1} +test "$rootdisk" || die "cannot find your root disk" + +info "Your rootdisk is $rootdisk" +sleep 3 + +umount /mnt/boot ||: +umount /mnt ||: +info "overwriting partitioning" +dd if=/dev/zero of=$rootdisk bs=2k count=10 +info "starting partitioning" +(printf "o\nn\np\n\n\n+128M\n\a\nn\np\n\n\n\nw\n\n") |fdisk $rootdisk ||: +partprobe $rootdisk +info "done partitioning" +sleep 1 +info "generating filesystem on /boot" +mkfs.ext2 ${rootdisk}1 +info "Done" +sleep 1 +info "starting LVM magic" +vgchange -an ||: +vgremove -f pool0 ||: +pvcreate ${rootdisk}2 +vgcreate -ff pool0 ${rootdisk}2 +lvcreate -l 100%free -n root pool0 +info "finished creating LVM" +sleep 1 +info "generating filesystems on the LVM" +mkfs.ext4 /dev/mapper/pool0-root +info "finished generating filesystems" +sleep 1 +info "mounting" +mount /dev/mapper/pool0-root /mnt +mkdir /mnt/boot +mount ${rootdisk}1 /mnt/boot + +info "finished mounting!" +sleep 1 +info "installing!" + +info "Setting http proxy" + +info "Installing the following packages: $extra_pkg" +if [ -n "${user_pkg:-}" ] ;then + info "User chooses additional packages: $user_pkg" +else + info "No additional packages set by user (\$user_pkg unset)" +fi +pacstrap /mnt base base-devel $extra_pkg ${user_pkg:-} +info "installation done" +sleep 1 +info "generating configs" +genfstab -U -p /mnt > /mnt/etc/fstab + +info "beginning chroot!" +arch-chroot /mnt << EOF + +msg() { printf "\$*\n" >&2; } +info() { msg "$green\$*$nc"; } +error() { msg "$green\$*$nc"; } + +info "generating locales" +ln -s /usr/share/zoneinfo/Europe/Berlin /etc/localtime +echo "LANG=en_US.UTF-8" >> /etc/locale.conf +echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen +locale-gen +echo "filehooker$RANDOM" > /etc/hostname +sed -i 's/block/& lvm2/g' /etc/mkinitcpio.conf +info "Done! " +mkinitcpio -p linux +info "setting root password" +printf "${pass}\n${pass}\n" | (passwd ) +info "adding user" +useradd -m -G audio,video,wheel $admin +printf "${pass}\n${pass}\n" | (passwd $admin) + +info "editing sudoers" +printf "root ALL=(ALL) ALL\n%s ALL=(ALL)NOPASSWD: ALL\n" %wheel >> /etc/sudoers +for i in dhcpcd ntpd tor sshd ; do + info "enabling \$i" + systemctl enable \$i +done + +info "installing grub" +grub-install ${rootdisk} 2>/dev/null +#echo "GRUB_DISABLE_LINUX_UUID=true" >> /etc/default/grub +grub-mkconfig > /boot/grub/grub.cfg 2>/dev/null +# prepare ncdc +useradd -m hooker +exit +EOF + +info "configuring tor" +torrc=/mnt/etc/tor/torrc +hidden_service_dir=/var/lib/tor/hidden_service/ +#@include tor +configure_hidden_service +info "publishing hidden service address" +cat $hidden_service_dir/hostname | send_irc +info "configure ncdc" +ncdc_install +netshare= +dc_hub=adcs://elch.nsupdate.info:2781 +configure_ncdc +info "We're all done, simply reboot!" -- cgit v1.2.3 From d352ce6c3d6d8f7d4588dbf51ea479f2af89a7b2 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 9 Mar 2014 22:31:18 +0100 Subject: ship:rename remaster_arch --- ship/src/remaster_arch_iso | 109 ------------------------------ ship/src/remaster_arch_shack_installstick | 109 ++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+), 109 deletions(-) delete mode 100755 ship/src/remaster_arch_iso create mode 100755 ship/src/remaster_arch_shack_installstick (limited to 'ship/src') diff --git a/ship/src/remaster_arch_iso b/ship/src/remaster_arch_iso deleted file mode 100755 index 94a750c1..00000000 --- a/ship/src/remaster_arch_iso +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/sh -#@include core -#@mainifyme - -## TODO: provide a parameter which defines what to be done in the new iso root -set -efu -isofile=${1:-archlinux-2013.06.01-dual.iso} -outfile=$(basename ${isofile%.iso}.krebs.iso) -info "outfile will be at $outfile" -bdir=${bdir:-$HOME/build/arch} -isodir=$bdir/iso -isomnt=$bdir/isomount -rootdir=$bdir/root -outdir=$bdir/out -auto_url=euer.krebsco.de/autoinstall -info "bdir is at $bdir" -[ ! -e "$isofile" ] && die "$isofile does not exist." -esudo "$@" - - -#punani install genisoimage - - -info "cleanup root dir" -rm -rf $bdir -mkdir -p $isomnt $rootdir -info "mounting isofile ($isofile)" -if is_root;then - mount -t iso9660 -o loop,ro $isofile $isomnt -else - die 'we are not root enough to mount the iso.' -fi -defer "info 'unmounting $isomnt';umount $isomnt" - -info "copying from '$isomnt' to '$isodir'" -cp -a "$isomnt" "$isodir" -defer "info 'removing $isodir';rm -rf $isodir" -info "extracting root-image squashfs" -# we will not touch the kernel ... yet - -for arch in x86_64 i686;do - info "unpacking $isomnt/arch/$arch/root-image.fs.sfs" - mkdir -p "$outdir/$arch" - defer "info 'removing $outdir/$arch';rm -rf $outdir/$arch" - mkdir -p "$rootdir/$arch" - defer "info 'removing $rootdir/$arch';rm -rf $rootdir/$arch" - unsquashfs -f -d "$outdir/$arch" "$isodir/arch/$arch/root-image.fs.sfs" - - mount "$outdir/$arch/root-image.fs" "$rootdir/$arch" - defer "info 'unmounting $rootdir/$arch';umount $rootdir/$arch||info 'not mounted'" - - info "Starting of the rootdir verkrepelung" - # do the magic here - arch-chroot $rootdir/$arch <> /root/.zshrc< /krebs/autoinstall </dev/null 2>&1; } -while ! internet;do - echo "no Internet yet, waiting ..." - sleep 3 -done - -echo "Grabbing current version of install-script from $auto_url" -echo -echo "AGENTS ARE GOOOOOOOOOOO!" -curl $auto_url 2>/dev/null | sh -EOL -chmod 755 /krebs/autoinstall -EOF - info "deleting old squashfs" - rm "$isodir/arch/$arch/root-image.fs.sfs" - info "creating squashfs at $isodir/arch/$arch/root-image.fs.sfs" - umount "$rootdir/$arch" - mksquashfs "$outdir/$arch/root-image.fs" "$isodir/arch/$arch/root-image.fs.sfs" -done - -info "creating Iso Image" -#genisoimage -l -r -J -V "ARCH_$(date +%Y%m)" \ -# -b isolinux/isolinux.bin -no-emul-boot \ -# -boot-load-size 4 -boot-info-table -c isolinux/boot.cat \ -# -o "$outdir/$outfile" "$isodir" -rm -f "${outdir}/${outfile}" -xorriso -as mkisofs \ - -iso-level 3 \ - -full-iso9660-filenames \ - -volid "ARCH_201311" \ - -appid "Shackspace Krebs Installer" \ - -publisher "Shackspace/Krebs" \ - -preparer "prepared by krebs" \ - -eltorito-boot isolinux/isolinux.bin \ - -eltorito-catalog isolinux/boot.cat \ - -no-emul-boot -boot-load-size 4 -boot-info-table \ - -isohybrid-mbr ${isomnt}/isolinux/isohdpfx.bin \ - -output "${outdir}/${outfile}" \ - "$isodir" - diff --git a/ship/src/remaster_arch_shack_installstick b/ship/src/remaster_arch_shack_installstick new file mode 100755 index 00000000..5ac29473 --- /dev/null +++ b/ship/src/remaster_arch_shack_installstick @@ -0,0 +1,109 @@ +#!/bin/sh +#@include core +#@mainifyme + +## TODO: provide a parameter which defines what to be done in the new iso root +set -efu +isofile=${1:-archlinux-2013.06.01-dual.iso} +outfile=$(basename ${isofile%.iso}.krebs.iso) +info "outfile will be at $outfile" +bdir=${bdir:-$HOME/build/arch} +isodir=$bdir/iso +isomnt=$bdir/isomount +rootdir=$bdir/root +outdir=$bdir/out +auto_url=euer.krebsco.de/filepimp_installer +info "bdir is at $bdir" +[ ! -e "$isofile" ] && die "$isofile does not exist." +esudo "$@" + + +#punani install genisoimage + + +info "cleanup root dir" +rm -rf $bdir +mkdir -p $isomnt $rootdir +info "mounting isofile ($isofile)" +if is_root;then + mount -t iso9660 -o loop,ro $isofile $isomnt +else + die 'we are not root enough to mount the iso.' +fi +defer "info 'unmounting $isomnt';umount $isomnt" + +info "copying from '$isomnt' to '$isodir'" +cp -a "$isomnt" "$isodir" +defer "info 'removing $isodir';rm -rf $isodir" +info "extracting root-image squashfs" +# we will not touch the kernel ... yet + +for arch in x86_64 i686;do + info "unpacking $isomnt/arch/$arch/root-image.fs.sfs" + mkdir -p "$outdir/$arch" + defer "info 'removing $outdir/$arch';rm -rf $outdir/$arch" + mkdir -p "$rootdir/$arch" + defer "info 'removing $rootdir/$arch';rm -rf $rootdir/$arch" + unsquashfs -f -d "$outdir/$arch" "$isodir/arch/$arch/root-image.fs.sfs" + + mount "$outdir/$arch/root-image.fs" "$rootdir/$arch" + defer "info 'unmounting $rootdir/$arch';umount $rootdir/$arch||info 'not mounted'" + + info "Starting of the rootdir verkrepelung" + # do the magic here + arch-chroot $rootdir/$arch <> /root/.zshrc< /krebs/autoinstall </dev/null 2>&1; } +while ! internet;do + echo "no Internet yet, waiting ..." + sleep 3 +done + +echo "Grabbing current version of install-script from $auto_url" +echo +echo "AGENTS ARE GOOOOOOOOOOO!" +curl $auto_url 2>/dev/null | sh +EOL +chmod 755 /krebs/autoinstall +EOF + info "deleting old squashfs" + rm "$isodir/arch/$arch/root-image.fs.sfs" + info "creating squashfs at $isodir/arch/$arch/root-image.fs.sfs" + umount "$rootdir/$arch" + mksquashfs "$outdir/$arch/root-image.fs" "$isodir/arch/$arch/root-image.fs.sfs" +done + +info "creating Iso Image" +#genisoimage -l -r -J -V "ARCH_$(date +%Y%m)" \ +# -b isolinux/isolinux.bin -no-emul-boot \ +# -boot-load-size 4 -boot-info-table -c isolinux/boot.cat \ +# -o "$outdir/$outfile" "$isodir" +rm -f "${outdir}/${outfile}" +xorriso -as mkisofs \ + -iso-level 3 \ + -full-iso9660-filenames \ + -volid "ARCH_201311" \ + -appid "Shackspace Krebs Installer" \ + -publisher "Shackspace/Krebs" \ + -preparer "prepared by krebs" \ + -eltorito-boot isolinux/isolinux.bin \ + -eltorito-catalog isolinux/boot.cat \ + -no-emul-boot -boot-load-size 4 -boot-info-table \ + -isohybrid-mbr ${isomnt}/isolinux/isohdpfx.bin \ + -output "${outdir}/${outfile}" \ + "$isodir" + -- cgit v1.2.3 From 0970f673456cf8bef932aef048bb89f6178eb104 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 9 Mar 2014 22:32:48 +0100 Subject: ship:implement ncdc configuration --- ship/src/filehooker_configure_ncdc | 15 +++++++++++++++ ship/src/filehooker_configure_netshare | 6 ++++++ 2 files changed, 21 insertions(+) create mode 100644 ship/src/filehooker_configure_ncdc create mode 100644 ship/src/filehooker_configure_netshare (limited to 'ship/src') diff --git a/ship/src/filehooker_configure_ncdc b/ship/src/filehooker_configure_ncdc new file mode 100644 index 00000000..c980ebf2 --- /dev/null +++ b/ship/src/filehooker_configure_ncdc @@ -0,0 +1,15 @@ +#!/bin/sh +#@info +#@strict +#@include filehooker + +dc_hub="adcs://elch.nsupdate.info:2781" +rnd=`hexdump -n 2 -e '/2 "%u"' /dev/urandom` +nick="filehooker_$rnd" + + +ncdc_install +ncdc_autostart + +ncdc_configure_nick "$nick" +ncdc_configure_hub "$dc_hub" diff --git a/ship/src/filehooker_configure_netshare b/ship/src/filehooker_configure_netshare new file mode 100644 index 00000000..ffd53e08 --- /dev/null +++ b/ship/src/filehooker_configure_netshare @@ -0,0 +1,6 @@ +#!/bin/sh +#@info +#@strict +#@include filehooker + +ncdc_configure_netshare "${1?provide share folder}" -- cgit v1.2.3 From 0f58a42f4442afc84534c866bf765bab2735173f Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 9 Mar 2014 23:07:05 +0100 Subject: ship: update filehooker install --- ship/src/filehooker_install | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'ship/src') diff --git a/ship/src/filehooker_install b/ship/src/filehooker_install index 108f2421..1b9717f1 100755 --- a/ship/src/filehooker_install +++ b/ship/src/filehooker_install @@ -1,8 +1,15 @@ #/bin/sh +#@info #@strict #@include core +## colored logging #@include color #@include network + +## for tor hidden service +#@include tor + +## for ncdc #@include filehooker pass=lolwut.aidsballs admin=pimp @@ -66,8 +73,9 @@ info "generating configs" genfstab -U -p /mnt > /mnt/etc/fstab info "beginning chroot!" +########### BEGIN CHROOT ##### arch-chroot /mnt << EOF - +#@strict msg() { printf "\$*\n" >&2; } info() { msg "$green\$*$nc"; } error() { msg "$green\$*$nc"; } @@ -102,17 +110,14 @@ grub-mkconfig > /boot/grub/grub.cfg 2>/dev/null useradd -m hooker exit EOF +######## END CHROOT ########## info "configuring tor" torrc=/mnt/etc/tor/torrc hidden_service_dir=/var/lib/tor/hidden_service/ -#@include tor configure_hidden_service info "publishing hidden service address" cat $hidden_service_dir/hostname | send_irc info "configure ncdc" -ncdc_install -netshare= -dc_hub=adcs://elch.nsupdate.info:2781 -configure_ncdc +curl conf.krebsco.de/filehooker_configure_ncdc | arch-chroot /mnt info "We're all done, simply reboot!" -- cgit v1.2.3 From ee63a28d029408a9a3012917a5169df5addd239a Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 10 Mar 2014 23:06:50 +0100 Subject: add volid finder for remastering scripts --- ship/src/remaster_arch_filehooker | 106 ++++++++++++++++++++++++++++++ ship/src/remaster_arch_shack_installstick | 34 +++++----- 2 files changed, 125 insertions(+), 15 deletions(-) create mode 100755 ship/src/remaster_arch_filehooker (limited to 'ship/src') diff --git a/ship/src/remaster_arch_filehooker b/ship/src/remaster_arch_filehooker new file mode 100755 index 00000000..54f0b082 --- /dev/null +++ b/ship/src/remaster_arch_filehooker @@ -0,0 +1,106 @@ +#!/bin/sh +#@include core +#@include iso +#@mainifyme + +## TODO: provide a parameter which defines what to be done in the new iso root +set -efu +isofile=${1:-archlinux-2013.06.01-dual.iso} +outfile=$(basename ${isofile%.iso}.krebs.iso) +info "outfile will be at $outfile" +bdir=${bdir:-$HOME/build/arch} +isodir=$bdir/iso +isomnt=$bdir/isomount +rootdir=$bdir/root +outdir=$bdir/out +auto_url=conf.krebsco.de/filehooker_install +info "bdir is at $bdir" +[ ! -e "$isofile" ] && die "$isofile does not exist." +esudo "$@" +arch_label="$(get_volid "$isofile")" +info "Arch iso label is ${arch_label}" + + +info "cleanup root dir" +rm -rf $bdir +mkdir -p $isomnt $rootdir +info "mounting isofile ($isofile)" +if is_root;then + mount -t iso9660 -o loop,ro $isofile $isomnt +else + die 'we are not root enough to mount the iso.' +fi +defer "info 'unmounting $isomnt';umount $isomnt" + +info "copying from '$isomnt' to '$isodir'" +cp -a "$isomnt" "$isodir" +defer "info 'removing $isodir';rm -rf $isodir" +info "extracting root-image squashfs" +# we will not touch the kernel ... yet + +for arch in x86_64 i686;do + info "unpacking $isomnt/arch/$arch/root-image.fs.sfs" + mkdir -p "$outdir/$arch" + defer "info 'removing $outdir/$arch';rm -rf $outdir/$arch" + mkdir -p "$rootdir/$arch" + defer "info 'removing $rootdir/$arch';rm -rf $rootdir/$arch" + unsquashfs -f -d "$outdir/$arch" "$isodir/arch/$arch/root-image.fs.sfs" + + mount "$outdir/$arch/root-image.fs" "$rootdir/$arch" + defer "info 'unmounting $rootdir/$arch';umount $rootdir/$arch||info 'not mounted'" + + info "Starting of the rootdir verkrepelung" + # do the magic here + arch-chroot $rootdir/$arch <> /root/.zshrc< +EOD +# /krebs/autoinstall +EOL + + : \${1?\$0 } + mkdir /krebs + cat > /krebs/autoinstall </dev/null 2>&1; } +while ! internet;do + echo "no Internet yet, waiting ..." + sleep 3 +done + +echo "Grabbing current version of install-script from $auto_url" +echo +echo "AGENTS ARE GOOOOOOOOOOO!" +curl $auto_url 2>/dev/null | sh -s "\\\$@" +EOL +chmod 755 /krebs/autoinstall +EOF + info "deleting old squashfs" + rm "$isodir/arch/$arch/root-image.fs.sfs" + info "creating squashfs at $isodir/arch/$arch/root-image.fs.sfs" + umount "$rootdir/$arch" + mksquashfs "$outdir/$arch/root-image.fs" "$isodir/arch/$arch/root-image.fs.sfs" +done + +info "creating Iso Image" +rm -f "${outdir}/${outfile}" +xorriso -as mkisofs \ + -iso-level 3 \ + -full-iso9660-filenames \ + -volid "ARCH_201311" \ + -appid "Shackspace Krebs Installer" \ + -publisher "Shackspace/Krebs" \ + -preparer "prepared by krebs" \ + -eltorito-boot isolinux/isolinux.bin \ + -eltorito-catalog isolinux/boot.cat \ + -no-emul-boot -boot-load-size 4 -boot-info-table \ + -isohybrid-mbr ${isomnt}/isolinux/isohdpfx.bin \ + -output "${outdir}/${outfile}" \ + "$isodir" + diff --git a/ship/src/remaster_arch_shack_installstick b/ship/src/remaster_arch_shack_installstick index 5ac29473..364e1958 100755 --- a/ship/src/remaster_arch_shack_installstick +++ b/ship/src/remaster_arch_shack_installstick @@ -1,23 +1,26 @@ #!/bin/sh #@include core +#@include iso #@mainifyme ## TODO: provide a parameter which defines what to be done in the new iso root set -efu -isofile=${1:-archlinux-2013.06.01-dual.iso} -outfile=$(basename ${isofile%.iso}.krebs.iso) +isofile="${1:-archlinux-2013.06.01-dual.iso}" +outfile="$(basename "${isofile%.iso}".krebs.iso)" info "outfile will be at $outfile" -bdir=${bdir:-$HOME/build/arch} -isodir=$bdir/iso -isomnt=$bdir/isomount -rootdir=$bdir/root -outdir=$bdir/out -auto_url=euer.krebsco.de/filepimp_installer +bdir="${bdir:-$HOME/build/arch}" +isodir="$bdir/iso" +isomnt="$bdir/isomount" +rootdir="$bdir/root" +outdir="$bdir/out" +echo "$outdir/$outfile" +auto_url=euer.krebsco.de/arch_autoinstall info "bdir is at $bdir" [ ! -e "$isofile" ] && die "$isofile does not exist." +arch_label="$(get_volid "$isofile")" +info "Arch iso label is ${arch_label}" esudo "$@" - #punani install genisoimage @@ -26,17 +29,18 @@ rm -rf $bdir mkdir -p $isomnt $rootdir info "mounting isofile ($isofile)" if is_root;then - mount -t iso9660 -o loop,ro $isofile $isomnt + mount -t iso9660 -o loop,ro "$isofile" "$isomnt" else die 'we are not root enough to mount the iso.' fi -defer "info 'unmounting $isomnt';umount $isomnt" +defer "info 'unmounting $isomnt';umount \"$isomnt\"" info "copying from '$isomnt' to '$isodir'" cp -a "$isomnt" "$isodir" defer "info 'removing $isodir';rm -rf $isodir" + info "extracting root-image squashfs" -# we will not touch the kernel ... yet + for arch in x86_64 i686;do info "unpacking $isomnt/arch/$arch/root-image.fs.sfs" @@ -51,7 +55,7 @@ for arch in x86_64 i686;do info "Starting of the rootdir verkrepelung" # do the magic here - arch-chroot $rootdir/$arch <> /root/.zshrc< Date: Wed, 12 Mar 2014 10:29:32 +0100 Subject: update arch autoinstaller --- ship/src/arch_autoinstall | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'ship/src') diff --git a/ship/src/arch_autoinstall b/ship/src/arch_autoinstall index baa9e2a0..c9b6c4d4 100755 --- a/ship/src/arch_autoinstall +++ b/ship/src/arch_autoinstall @@ -3,13 +3,12 @@ #@include core #@include color #@include network +#@include tor pass=shackit shack_printer_ip=10.42.0.135 extra_pkg="xorg vim xfce4 feh chromium zsh sudo git flashplugin alsa-oss alsa-lib alsa-utils grub-bios slim ntp tor network-manager-applet networkmanager openssh cups cups-filters" info "writing stdout to /tmp/install.log" -exec >> /tmp/install.log -tail -f /tmp/install.log& defer 'pkill tail' installer_disk(){ @@ -35,7 +34,7 @@ sleep 3 umount /mnt/boot ||: umount /mnt ||: info "starting partitioning" -(printf "o\nn\np\n\n\n+256M\n\a\nn\np\n\n\n\nw\n\n") |fdisk $rootdisk +(printf "o\nn\np\n\n\n+256M\n\a\nn\np\n\n\n\nw\n\n") |fdisk $rootdisk||: info "done partitioning" sleep 1 info "generating filesystem on /boot" @@ -84,7 +83,7 @@ info "generating configs" genfstab -U -p /mnt > /mnt/etc/fstab info "beginning chroot!" -arch-chroot /mnt | tee -a /tmp/install.log << EOF +arch-chroot /mnt << EOF msg() { printf "\$*\n" >&2; } info() { msg "$green\$*$nc"; } @@ -119,7 +118,7 @@ done ### CUPS mkdir -p /etc/cups -cat >>/etc/cups/printers.conf<>/etc/cups/printers.conf< Info Shack Printer HP 5000 Location lounge @@ -137,7 +136,7 @@ KLimit 0 OpPolicy default ErrorPolicy stop-printer -EOF +EOT info "installing grub" grub-install ${rootdisk} 2>/dev/null @@ -155,7 +154,11 @@ EOF info "configuring tor" torrc=/mnt/etc/tor/torrc hidden_service_dir=/var/lib/tor/hidden_service/ -#@include tor configure_hidden_service +#TODO publish tor address after reboot +#info "publishing hidden service address" +#cat $hidden_service_dir/hostname | send_irc + info "We're all done, simply reboot!" +reboot -- cgit v1.2.3 From b61b596741a1ae3be0c188a648efd9ad619407bb Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 13 Mar 2014 21:05:45 +0100 Subject: generalize install stick remastering --- ship/src/fix_dircolors | 2 +- ship/src/remaster_arch_filehooker | 106 ------------------------------ ship/src/remaster_arch_shack_installstick | 47 ++++++------- 3 files changed, 20 insertions(+), 135 deletions(-) delete mode 100755 ship/src/remaster_arch_filehooker (limited to 'ship/src') diff --git a/ship/src/fix_dircolors b/ship/src/fix_dircolors index b2e2ffdb..d427563f 100755 --- a/ship/src/fix_dircolors +++ b/ship/src/fix_dircolors @@ -6,7 +6,7 @@ exists dircolors || die "no dircolors in PATH, bailing out" info "fixing dircolors for $(id -un)" dircolors -p > $HOME/.dircolors -sed -i 's/\(DIR \).*/\101;35/' $HOME/.dircolors +sed -i 's/\(DIR \).*/\101;36/' $HOME/.dircolors ! grep -q 'dircolors' $HOME/.profile && \ info "adding dircolors line to $HOME/.profile" && \ echo 'eval `dircolors -b $HOME/.dircolors`' >> $HOME/.profile diff --git a/ship/src/remaster_arch_filehooker b/ship/src/remaster_arch_filehooker deleted file mode 100755 index 54f0b082..00000000 --- a/ship/src/remaster_arch_filehooker +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh -#@include core -#@include iso -#@mainifyme - -## TODO: provide a parameter which defines what to be done in the new iso root -set -efu -isofile=${1:-archlinux-2013.06.01-dual.iso} -outfile=$(basename ${isofile%.iso}.krebs.iso) -info "outfile will be at $outfile" -bdir=${bdir:-$HOME/build/arch} -isodir=$bdir/iso -isomnt=$bdir/isomount -rootdir=$bdir/root -outdir=$bdir/out -auto_url=conf.krebsco.de/filehooker_install -info "bdir is at $bdir" -[ ! -e "$isofile" ] && die "$isofile does not exist." -esudo "$@" -arch_label="$(get_volid "$isofile")" -info "Arch iso label is ${arch_label}" - - -info "cleanup root dir" -rm -rf $bdir -mkdir -p $isomnt $rootdir -info "mounting isofile ($isofile)" -if is_root;then - mount -t iso9660 -o loop,ro $isofile $isomnt -else - die 'we are not root enough to mount the iso.' -fi -defer "info 'unmounting $isomnt';umount $isomnt" - -info "copying from '$isomnt' to '$isodir'" -cp -a "$isomnt" "$isodir" -defer "info 'removing $isodir';rm -rf $isodir" -info "extracting root-image squashfs" -# we will not touch the kernel ... yet - -for arch in x86_64 i686;do - info "unpacking $isomnt/arch/$arch/root-image.fs.sfs" - mkdir -p "$outdir/$arch" - defer "info 'removing $outdir/$arch';rm -rf $outdir/$arch" - mkdir -p "$rootdir/$arch" - defer "info 'removing $rootdir/$arch';rm -rf $rootdir/$arch" - unsquashfs -f -d "$outdir/$arch" "$isodir/arch/$arch/root-image.fs.sfs" - - mount "$outdir/$arch/root-image.fs" "$rootdir/$arch" - defer "info 'unmounting $rootdir/$arch';umount $rootdir/$arch||info 'not mounted'" - - info "Starting of the rootdir verkrepelung" - # do the magic here - arch-chroot $rootdir/$arch <> /root/.zshrc< -EOD -# /krebs/autoinstall -EOL - - : \${1?\$0 } - mkdir /krebs - cat > /krebs/autoinstall </dev/null 2>&1; } -while ! internet;do - echo "no Internet yet, waiting ..." - sleep 3 -done - -echo "Grabbing current version of install-script from $auto_url" -echo -echo "AGENTS ARE GOOOOOOOOOOO!" -curl $auto_url 2>/dev/null | sh -s "\\\$@" -EOL -chmod 755 /krebs/autoinstall -EOF - info "deleting old squashfs" - rm "$isodir/arch/$arch/root-image.fs.sfs" - info "creating squashfs at $isodir/arch/$arch/root-image.fs.sfs" - umount "$rootdir/$arch" - mksquashfs "$outdir/$arch/root-image.fs" "$isodir/arch/$arch/root-image.fs.sfs" -done - -info "creating Iso Image" -rm -f "${outdir}/${outfile}" -xorriso -as mkisofs \ - -iso-level 3 \ - -full-iso9660-filenames \ - -volid "ARCH_201311" \ - -appid "Shackspace Krebs Installer" \ - -publisher "Shackspace/Krebs" \ - -preparer "prepared by krebs" \ - -eltorito-boot isolinux/isolinux.bin \ - -eltorito-catalog isolinux/boot.cat \ - -no-emul-boot -boot-load-size 4 -boot-info-table \ - -isohybrid-mbr ${isomnt}/isolinux/isohdpfx.bin \ - -output "${outdir}/${outfile}" \ - "$isodir" - diff --git a/ship/src/remaster_arch_shack_installstick b/ship/src/remaster_arch_shack_installstick index 364e1958..ea594fb2 100755 --- a/ship/src/remaster_arch_shack_installstick +++ b/ship/src/remaster_arch_shack_installstick @@ -5,23 +5,20 @@ ## TODO: provide a parameter which defines what to be done in the new iso root set -efu -isofile="${1:-archlinux-2013.06.01-dual.iso}" -outfile="$(basename "${isofile%.iso}".krebs.iso)" +isofile=${1:-archlinux-2013.06.01-dual.iso} +outfile=$(basename ${isofile%.iso}.krebs.iso) info "outfile will be at $outfile" -bdir="${bdir:-$HOME/build/arch}" -isodir="$bdir/iso" -isomnt="$bdir/isomount" -rootdir="$bdir/root" -outdir="$bdir/out" -echo "$outdir/$outfile" -auto_url=euer.krebsco.de/arch_autoinstall +bdir=${bdir:-$HOME/build/arch} +isodir=$bdir/iso +isomnt=$bdir/isomount +rootdir=$bdir/root +outdir=$bdir/out +auto_url=${2:conf.krebsco.de/arch_autoinstall} info "bdir is at $bdir" [ ! -e "$isofile" ] && die "$isofile does not exist." +esudo "$@" arch_label="$(get_volid "$isofile")" info "Arch iso label is ${arch_label}" -esudo "$@" - -#punani install genisoimage info "cleanup root dir" @@ -29,18 +26,17 @@ rm -rf $bdir mkdir -p $isomnt $rootdir info "mounting isofile ($isofile)" if is_root;then - mount -t iso9660 -o loop,ro "$isofile" "$isomnt" + mount -t iso9660 -o loop,ro $isofile $isomnt else die 'we are not root enough to mount the iso.' fi -defer "info 'unmounting $isomnt';umount \"$isomnt\"" +defer "info 'unmounting $isomnt';umount $isomnt" info "copying from '$isomnt' to '$isodir'" cp -a "$isomnt" "$isodir" defer "info 'removing $isodir';rm -rf $isodir" - info "extracting root-image squashfs" - +# we will not touch the kernel ... yet for arch in x86_64 i686;do info "unpacking $isomnt/arch/$arch/root-image.fs.sfs" @@ -55,7 +51,7 @@ for arch in x86_64 i686;do info "Starting of the rootdir verkrepelung" # do the magic here - arch-chroot "$rootdir/$arch" <> /root/.zshrc< EOD /krebs/autoinstall EOL + mkdir /krebs cat > /krebs/autoinstall </dev/null 2>&1; } @@ -80,7 +75,7 @@ done echo "Grabbing current version of install-script from $auto_url" echo echo "AGENTS ARE GOOOOOOOOOOO!" -curl $auto_url 2>/dev/null | sh +curl "$auto_url" 2>/dev/null | sh -s "\\\$@" EOL chmod 755 /krebs/autoinstall EOF @@ -88,26 +83,22 @@ EOF rm "$isodir/arch/$arch/root-image.fs.sfs" info "creating squashfs at $isodir/arch/$arch/root-image.fs.sfs" umount "$rootdir/$arch" - mksquashfs "$outdir/$arch/root-image.fs" "$isodir/arch/$arch/root-image.fs.sfs" + mksquashfs "$outdir/$arch/root-image.fs" "$isodir/arch/$arch/root-image.fs.sfs" done info "creating Iso Image" -#genisoimage -l -r -J -V "ARCH_$(date +%Y%m)" \ -# -b isolinux/isolinux.bin -no-emul-boot \ -# -boot-load-size 4 -boot-info-table -c isolinux/boot.cat \ -# -o "$outdir/$outfile" "$isodir" rm -f "${outdir}/${outfile}" xorriso -as mkisofs \ -iso-level 3 \ -full-iso9660-filenames \ - -volid "$arch_label" \ + -volid "ARCH_201311" \ -appid "Shackspace Krebs Installer" \ -publisher "Shackspace/Krebs" \ -preparer "prepared by krebs" \ -eltorito-boot isolinux/isolinux.bin \ -eltorito-catalog isolinux/boot.cat \ -no-emul-boot -boot-load-size 4 -boot-info-table \ - -isohybrid-mbr "${isomnt}/isolinux/isohdpfx.bin" \ + -isohybrid-mbr ${isomnt}/isolinux/isohdpfx.bin \ -output "${outdir}/${outfile}" \ "$isodir" -- cgit v1.2.3 From d13ad30fdbf0638cf019f9e3888e5c1c6afd11ef Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 14 Mar 2014 23:28:12 +0100 Subject: fix broken arch remaster script --- ship/src/remaster_arch_shack_installstick | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ship/src') diff --git a/ship/src/remaster_arch_shack_installstick b/ship/src/remaster_arch_shack_installstick index ea594fb2..3ad985af 100755 --- a/ship/src/remaster_arch_shack_installstick +++ b/ship/src/remaster_arch_shack_installstick @@ -13,13 +13,13 @@ isodir=$bdir/iso isomnt=$bdir/isomount rootdir=$bdir/root outdir=$bdir/out -auto_url=${2:conf.krebsco.de/arch_autoinstall} +auto_url=${2:-conf.krebsco.de/arch_autoinstall} info "bdir is at $bdir" [ ! -e "$isofile" ] && die "$isofile does not exist." esudo "$@" arch_label="$(get_volid "$isofile")" info "Arch iso label is ${arch_label}" - +info "auto_url is $auto_url" info "cleanup root dir" rm -rf $bdir @@ -59,7 +59,7 @@ Just Wait until everything finished. - Make sure that RJ45 is connected - you can bail out of the progress at any time with CTRL-C - /krebs/autoinstall + /krebs/autoinstall (args) EOD /krebs/autoinstall EOL @@ -91,7 +91,7 @@ rm -f "${outdir}/${outfile}" xorriso -as mkisofs \ -iso-level 3 \ -full-iso9660-filenames \ - -volid "ARCH_201311" \ + -volid "${arch_label}" \ -appid "Shackspace Krebs Installer" \ -publisher "Shackspace/Krebs" \ -preparer "prepared by krebs" \ -- cgit v1.2.3 From e2cf4fc92569487e21d096ac6879177aac8f73c1 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 16 Mar 2014 12:55:24 +0100 Subject: update tor_announce --- ship/src/install_tor_announce | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 ship/src/install_tor_announce (limited to 'ship/src') diff --git a/ship/src/install_tor_announce b/ship/src/install_tor_announce new file mode 100644 index 00000000..b7b3662e --- /dev/null +++ b/ship/src/install_tor_announce @@ -0,0 +1,5 @@ +#!/bin/sh +#@strict +#@include filehooker + +install_tor_announce -- cgit v1.2.3 From 5ddec8ce80976ce02f1302d80aa155bb2755b4f1 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 15 Apr 2014 13:50:54 +0200 Subject: update bootstrap env with gundo --- ship/src/bootstrap_env_makefu | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'ship/src') diff --git a/ship/src/bootstrap_env_makefu b/ship/src/bootstrap_env_makefu index 6c75cd57..3088d059 100755 --- a/ship/src/bootstrap_env_makefu +++ b/ship/src/bootstrap_env_makefu @@ -92,6 +92,21 @@ Bundle 'snipMate' Bundle 'tpope/vim-fugitive' Bundle 'Valloric/YouCompleteMe' Bundle 'scrooloose/syntastic' +Bundle 'scrooloose/syntastic' +Bundle 'sjl/gundo.vim' + +nnoremap :GundoToggle +set undodir=~/.vim/undo +set undofile +"maximum number of changes that can be undone +set undolevels=1000000 +"maximum number lines to save for undo on a buffer reload +set undoreload=10000000 + +set pastetoggle= +set showmode +filetype plugin indent on + filetype plugin indent on @@ -122,7 +137,7 @@ vim_conf_sane_defaults #install all the vim stuff with the help of vundle cd $HOME/.vim -mkdir -p bundle +mkdir -p bundle undo backup info "Fetching vim-vundle" git clone https://github.com/gmarik/vundle.git bundle/vundle > /dev/null && \ info "Vim Vundle deployed" -- cgit v1.2.3 From baadbeda024630166a5c62fbfa92d642c77f687c Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 15 Apr 2014 13:53:24 +0200 Subject: bootstrap_env: add python auto complete --- ship/src/bootstrap_env_makefu | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'ship/src') diff --git a/ship/src/bootstrap_env_makefu b/ship/src/bootstrap_env_makefu index 3088d059..188a48e7 100755 --- a/ship/src/bootstrap_env_makefu +++ b/ship/src/bootstrap_env_makefu @@ -68,8 +68,13 @@ test -r ~/TODO && cat ~/TODO setopt menu_complete unsetopt correct_all +export PYTHONSTARTUP=~/.pythonrc +EOF +info 'deploying pythonrc' +cat > $HOME/.pythonrc < Date: Mon, 28 Apr 2014 11:05:03 +0200 Subject: bootstrap_env: fix duplicate vimrc line --- ship/src/bootstrap_env_makefu | 1 - 1 file changed, 1 deletion(-) (limited to 'ship/src') diff --git a/ship/src/bootstrap_env_makefu b/ship/src/bootstrap_env_makefu index 188a48e7..e61f4e99 100755 --- a/ship/src/bootstrap_env_makefu +++ b/ship/src/bootstrap_env_makefu @@ -97,7 +97,6 @@ Bundle 'snipMate' Bundle 'tpope/vim-fugitive' Bundle 'Valloric/YouCompleteMe' Bundle 'scrooloose/syntastic' -Bundle 'scrooloose/syntastic' Bundle 'sjl/gundo.vim' nnoremap :GundoToggle -- cgit v1.2.3