summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--elchos/root-image/etc/systemd/system/elch-hostname.service2
-rw-r--r--elchos/root-image/krebs/etc/Reaktor/config.py2
-rwxr-xr-xship/src/bootstrap_env_makefu17
-rw-r--r--sites/elchhub.nsupdate.info/install_adhpp44
4 files changed, 62 insertions, 3 deletions
diff --git a/elchos/root-image/etc/systemd/system/elch-hostname.service b/elchos/root-image/etc/systemd/system/elch-hostname.service
index bcee7964..8af94772 100644
--- a/elchos/root-image/etc/systemd/system/elch-hostname.service
+++ b/elchos/root-image/etc/systemd/system/elch-hostname.service
@@ -1,5 +1,5 @@
[Unit]
-Description=change filehooker hostname
+Description=change elchOS hostname
Before=network.target nss-lookup.target multi-user.target
[Service]
diff --git a/elchos/root-image/krebs/etc/Reaktor/config.py b/elchos/root-image/krebs/etc/Reaktor/config.py
index 5e07b659..a857a0c2 100644
--- a/elchos/root-image/krebs/etc/Reaktor/config.py
+++ b/elchos/root-image/krebs/etc/Reaktor/config.py
@@ -13,7 +13,7 @@ irc_server = 'irc.freenode.net'
irc_restart_timeout = 5
irc_port = 6667
irc_channels = [
- '#filehooker'
+ '#elchOS'
]
admin_file='admin.lst'
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 <F5> :GundoToggle<CR>
+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=<F2>
+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"
diff --git a/sites/elchhub.nsupdate.info/install_adhpp b/sites/elchhub.nsupdate.info/install_adhpp
new file mode 100644
index 00000000..6f2986d5
--- /dev/null
+++ b/sites/elchhub.nsupdate.info/install_adhpp
@@ -0,0 +1,44 @@
+curl https://aur.archlinux.org/packages/ad/adchpp/adchpp.tar.gz > adchpp.tar.gz
+tar xf adchpp.tar.gz
+cd adchpp
+# install all the deps
+makepkg
+pacman -U adchpp-*-x86_64.pkg.tar.xz
+vi /etc/adchpp/adchpp.xml
+# change description etc
+# add to servers:
+# <Server Port="2781" TLS="1" Certificate="/etc/adchpp/certs/cacert.pem"
+# PrivateKey="/etc/adchpp/certs/privkey.pem"
+# TrustedPath="/etc/adchpp/certs/trusted/"
+# DHParams="/etc/adchpp/certs/dhparam.pem"/>
+
+
+mkdir /etc/adchpp/certs
+cd /etc/adchpp/certs
+openssl genrsa -out privkey.pem 4096
+openssl req -new -x509 -key privkey.pem -out cacert.pem
+openssl dhparam -outform PEM -out dhparam.pem 1024
+
+cat > /var/lib/adchpp/motd.txt <<EOF
+Welcome to the Elch Hub
+ xx xx xx xx
+xxxx xx xxxx xxxx xxxx xx
+xxxx xx xxxx xxxx xxxx xx
+ xxxxxx xx xx xxxxxx
+ xxxxxx xxxxxxxxxx xxxxxx
+ xx xxxxxxxxxxxxxx xx
+ xxxxxxxxxxxxxxxxxxxxxxxxxx
+ xxxxxxxxxxxxxx
+ xxxxxxxxxxxxxxxxxxxxxx
+ xx xxxxxx xx
+ xx xx xx xx xx xx
+ xx xx xx xx xx xx
+ xx xxxx xx xx xxxx xx
+
+[!] SSL is at port 2781
+ connect via adcs://elchhub.nsupdate.info:2781/
+ better start using it
+EOF
+
+systemctl enable adchpp
+systemctl start adchpp