From d61c839ba79158c0398c7ae4ad0f486347a41f9a Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 9 Jun 2013 12:38:45 +0200 Subject: fix bug in loader selector --- retiolum/scripts/tinc_setup/new_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh index 57d59e25..5999a5c8 100755 --- a/retiolum/scripts/tinc_setup/new_install.sh +++ b/retiolum/scripts/tinc_setup/new_install.sh @@ -168,7 +168,7 @@ if ! exists curl ; then fi else LOADER=curl - HEAD_LOADER=$LOADER -I + HEAD_LOADER="$LOADER -I" fi if ! $HEAD_LOADER $SURL >/dev/null 2>/dev/null ;then -- cgit v1.2.3 From 54b7362f46cea8d516b0a84fb3390d57ca7332ba Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 9 Jun 2013 12:42:25 +0200 Subject: add cat1 --- retiolum/hosts/cat1 | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 retiolum/hosts/cat1 diff --git a/retiolum/hosts/cat1 b/retiolum/hosts/cat1 new file mode 100644 index 00000000..b963a069 --- /dev/null +++ b/retiolum/hosts/cat1 @@ -0,0 +1,11 @@ +Subnet = 10.243.173.245 +Subnet = 42:92f1:c30d:0d86:ea9b:3cc6:d7ef:e5ee + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAsWrrRkcZ5ESCuPNOwCp8LZDcpgfqZEb9aFtXhFAJ+RO1cINs7w+x +YbY3DwaPjSEfUYGbUwc3uV6S12aT5FDvoV7yyZhozFDekh0tPSEIoJNtM9KFw/ZC +BKNbLRheAdZAjCRgTNNyMVONjixFb6ucE/USRzS4UBpisgMo3A7ZVvqIq44MQGKO +uvdoZZyqXHxqaGorBadJChb021VJFvsfo0T50UUsbNwHXPPdWcZPxBq3zwgjwqyl +hLEqNbSUjGmg7kCj0LbpuT4o0kwnrrNQYgQtosp36hh8z6kEQnQcon1qoFptPOSh +PROgi4tUiizXfneGbCTwslxHcGTJOv5I/QIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From f936387dbb021162d54dc5a70c8d0badd3b36220 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 12 Jun 2013 09:19:09 +0200 Subject: remove old cat1 --- retiolum/hosts/cat1 | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 retiolum/hosts/cat1 diff --git a/retiolum/hosts/cat1 b/retiolum/hosts/cat1 deleted file mode 100644 index b963a069..00000000 --- a/retiolum/hosts/cat1 +++ /dev/null @@ -1,11 +0,0 @@ -Subnet = 10.243.173.245 -Subnet = 42:92f1:c30d:0d86:ea9b:3cc6:d7ef:e5ee - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAsWrrRkcZ5ESCuPNOwCp8LZDcpgfqZEb9aFtXhFAJ+RO1cINs7w+x -YbY3DwaPjSEfUYGbUwc3uV6S12aT5FDvoV7yyZhozFDekh0tPSEIoJNtM9KFw/ZC -BKNbLRheAdZAjCRgTNNyMVONjixFb6ucE/USRzS4UBpisgMo3A7ZVvqIq44MQGKO -uvdoZZyqXHxqaGorBadJChb021VJFvsfo0T50UUsbNwHXPPdWcZPxBq3zwgjwqyl -hLEqNbSUjGmg7kCj0LbpuT4o0kwnrrNQYgQtosp36hh8z6kEQnQcon1qoFptPOSh -PROgi4tUiizXfneGbCTwslxHcGTJOv5I/QIDAQAB ------END RSA PUBLIC KEY----- -- cgit v1.2.3 From 3b520027006da7352801f1fb980b6a930b8d32f6 Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 12 Jun 2013 09:21:26 +0200 Subject: fix typo in tinc installer --- retiolum/scripts/tinc_setup/new_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh index 5999a5c8..76ed9e70 100755 --- a/retiolum/scripts/tinc_setup/new_install.sh +++ b/retiolum/scripts/tinc_setup/new_install.sh @@ -121,7 +121,7 @@ find_os() } find_telnet(){ - if exists elnet >/dev/null;then + if exists telnet >/dev/null;then TELNET="`command -v telnet`" elif exists busybox >/dev/null;then TELNET="`command -v busybox` telnet" -- cgit v1.2.3 From 6f38388c11f1e177dab8f40692902eb416818678 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 17 Jun 2013 16:03:58 +0200 Subject: fix dart-serous hostname --- infest/profiles/makefu/vim/vimrc | 1 + retiolum/hosts/darth-serious | 12 ++++++++++++ retiolum/hosts/darth_serious | 12 ------------ 3 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 retiolum/hosts/darth-serious delete mode 100644 retiolum/hosts/darth_serious diff --git a/infest/profiles/makefu/vim/vimrc b/infest/profiles/makefu/vim/vimrc index 69ff3f58..123e15a5 100755 --- a/infest/profiles/makefu/vim/vimrc +++ b/infest/profiles/makefu/vim/vimrc @@ -11,6 +11,7 @@ Bundle 'gmarik/vundle' Bundle 'SudoEdit.vim' Bundle 'snipMate' Bundle 'tpope/vim-fugitive' +Bundle 'vim-scripts-iptables' Bundle 'pyflakes' filetype plugin indent on diff --git a/retiolum/hosts/darth-serious b/retiolum/hosts/darth-serious new file mode 100644 index 00000000..bcabc5f5 --- /dev/null +++ b/retiolum/hosts/darth-serious @@ -0,0 +1,12 @@ +Subnet = 10.243.0.84 +Subnet = 42:ff6b:5f0b:460d:2cee:4d05:73f7:5566/128 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAyx5x0jzfhex8EBSFLlOIkP1yJ5cSPLQ3hpPMvN0J7QdVbypU6a9C +fzGpzBph1sRwXnaqCMe0og5VT3EdFtngbmm6t/CyMhBojkxMQI08m71JT5c07+1U +OSSLXBXYHcN6cAEYEsvTiSuvP9RoAbUeQQbZryI4wpzzQ7ET1l7k/3eeXAwqRKR6 +xiqn/4597U09QYmllqfplJUBv2pIAIcFlm/KHvNTZGEZS83udfnECwDwgU63PMns +38yiCpI79kagXyTOGCbkUatt0KNTzGNLAm0CyeFd1AdgUrj8fVg2jQLQlBrze+Gx +jkphgkVEgMtVMTz8WKfz+Dro3jBfQstIjQIDAQAB +-----END RSA PUBLIC KEY----- + diff --git a/retiolum/hosts/darth_serious b/retiolum/hosts/darth_serious deleted file mode 100644 index bcabc5f5..00000000 --- a/retiolum/hosts/darth_serious +++ /dev/null @@ -1,12 +0,0 @@ -Subnet = 10.243.0.84 -Subnet = 42:ff6b:5f0b:460d:2cee:4d05:73f7:5566/128 - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAyx5x0jzfhex8EBSFLlOIkP1yJ5cSPLQ3hpPMvN0J7QdVbypU6a9C -fzGpzBph1sRwXnaqCMe0og5VT3EdFtngbmm6t/CyMhBojkxMQI08m71JT5c07+1U -OSSLXBXYHcN6cAEYEsvTiSuvP9RoAbUeQQbZryI4wpzzQ7ET1l7k/3eeXAwqRKR6 -xiqn/4597U09QYmllqfplJUBv2pIAIcFlm/KHvNTZGEZS83udfnECwDwgU63PMns -38yiCpI79kagXyTOGCbkUatt0KNTzGNLAm0CyeFd1AdgUrj8fVg2jQLQlBrze+Gx -jkphgkVEgMtVMTz8WKfz+Dro3jBfQstIjQIDAQAB ------END RSA PUBLIC KEY----- - -- cgit v1.2.3