From 245a815267928096ea18d9d49cd395b87a7af175 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 24 Jan 2013 23:40:05 +0100 Subject: services: minimal services.txt-over-ssh provider (twisted) --- services/Makefile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 services/Makefile (limited to 'services/Makefile') diff --git a/services/Makefile b/services/Makefile new file mode 100644 index 00000000..a68f095d --- /dev/null +++ b/services/Makefile @@ -0,0 +1,14 @@ +help:;@cat Makefile + +export authorized_keys_file := authorized_keys +export services_file := services.txt +export host_key_file := test.key + +test-client: + ssh localhost -p 1337 2>/dev/null + +test-server: + python test.py + +$(host_key_file): + ssh-keygen -t rsa -P '' -f $@ -- cgit v1.2.3 From 1025fa3e19d2678da41a13c2bce0846a661c0624 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 29 Jan 2013 11:58:13 +0000 Subject: add authorized_keys config for openssh-server --- services/Makefile | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'services/Makefile') diff --git a/services/Makefile b/services/Makefile index a68f095d..901769b8 100644 --- a/services/Makefile +++ b/services/Makefile @@ -1,9 +1,29 @@ help:;@cat Makefile - export authorized_keys_file := authorized_keys export services_file := services.txt export host_key_file := test.key +export services_home := /opt/services + +.PHONY: authorized_keys +$(services_home)/.ssh: + mkdir $@ + chown services:services $@ + +$(services_home)/.ssh/authorized_keys: $(services_home)/.ssh $(authorized_keys_file) + cp $(authorized_keys_file) $(services_home)/.ssh/authorized_keys + @echo "restricting authorized_keys..." + @sed -i 's#^#command="/bin/cat $(services_home)/services.txt",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty #' $(services_home)/.ssh/authorized_keys + +$(services_home)/services.txt: + @echo 'make sure to configure the services correctly in $(services_home)/services.txt' + cp $(services_file) $(services_home)/services.txt + +service-user: $(services_home)/services.txt $(services_home)/.ssh/authorized_keys + @echo 'also make sure that the user is created: make create-service-user' +create-service-user: + useradd -m -r -l -f -1 -d /opt/services services + test-client: ssh localhost -p 1337 2>/dev/null -- cgit v1.2.3 From f9a3b1b51a469ca56f9d573832ae50c7c3e38bd6 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 29 Jan 2013 15:47:26 +0000 Subject: fix useradd issues --- services/Makefile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'services/Makefile') diff --git a/services/Makefile b/services/Makefile index 901769b8..3ef670a3 100644 --- a/services/Makefile +++ b/services/Makefile @@ -5,6 +5,15 @@ export host_key_file := test.key export services_home := /opt/services .PHONY: authorized_keys + +service-user: $(services_home)/services.txt $(services_home)/.ssh/authorized_keys + @echo 'also make sure that the user is created: make create-service-user' + +create-service-user: + mkdir -p $(services_home) + rmdir $(services_home) + useradd -m -r -l -f -1 -d $(services_home) services + $(services_home)/.ssh: mkdir $@ chown services:services $@ @@ -18,11 +27,6 @@ $(services_home)/services.txt: @echo 'make sure to configure the services correctly in $(services_home)/services.txt' cp $(services_file) $(services_home)/services.txt -service-user: $(services_home)/services.txt $(services_home)/.ssh/authorized_keys - @echo 'also make sure that the user is created: make create-service-user' - -create-service-user: - useradd -m -r -l -f -1 -d /opt/services services test-client: ssh localhost -p 1337 2>/dev/null -- cgit v1.2.3 From ea60224f28cf702053d8fd06ef32cc683ed4aff1 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 29 Jan 2013 18:48:09 +0100 Subject: //services test.py -> test-server.py --- services/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'services/Makefile') diff --git a/services/Makefile b/services/Makefile index 3ef670a3..61e0f529 100644 --- a/services/Makefile +++ b/services/Makefile @@ -32,7 +32,7 @@ test-client: ssh localhost -p 1337 2>/dev/null test-server: - python test.py + ./test-server.py $(host_key_file): ssh-keygen -t rsa -P '' -f $@ -- cgit v1.2.3 From c17d13380945c0909adeddd2375c1c9c8aa26782 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 29 Jan 2013 18:57:49 +0100 Subject: //services test-server: log only if debug_log == 'true' --- services/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'services/Makefile') diff --git a/services/Makefile b/services/Makefile index 61e0f529..37931f47 100644 --- a/services/Makefile +++ b/services/Makefile @@ -1,5 +1,6 @@ help:;@cat Makefile export authorized_keys_file := authorized_keys +export debug_log := true export services_file := services.txt export host_key_file := test.key export services_home := /opt/services -- cgit v1.2.3 From 62b197ea0604cf9d785bf67eefcf7be00daa92b9 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 14 Feb 2013 13:06:07 +0100 Subject: create routine to update ssh_authorized_keys via ssh --- services/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'services/Makefile') diff --git a/services/Makefile b/services/Makefile index 37931f47..a4db7df1 100644 --- a/services/Makefile +++ b/services/Makefile @@ -7,7 +7,8 @@ export services_home := /opt/services .PHONY: authorized_keys -service-user: $(services_home)/services.txt $(services_home)/.ssh/authorized_keys + +service-user: $(services_home)/services.txt ssh_authorized_keys @echo 'also make sure that the user is created: make create-service-user' create-service-user: @@ -15,6 +16,8 @@ create-service-user: rmdir $(services_home) useradd -m -r -l -f -1 -d $(services_home) services +ssh_authorized_keys: $(services_home)/.ssh/authorized_keys + $(services_home)/.ssh: mkdir $@ chown services:services $@ -- cgit v1.2.3