Skip to content
This repository was archived by the owner on May 6, 2020. It is now read-only.

cc-proxy: Fix systemd socket and service #43

Merged
dlespiau merged 2 commits into from
May 3, 2017
Merged

cc-proxy: Fix systemd socket and service #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc3fe0a
cc-proxy: Fix systemd socket and service
May 2, 2017
8870d77
cc-proxy: Move from clearcontainers to clear-containers
May 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ LIBEXECDIR := $(PREFIX)/libexec
LOCALSTATEDIR := /var

SOURCES := $(shell find . 2>&1 | grep -E '.*\.(c|h|go)$$')
PROXY_SOCKET := $(LOCALSTATEDIR)/run/clearcontainers/proxy.sock
PROXY_SOCKET := $(LOCALSTATEDIR)/run/clear-containers/proxy.sock

#
# systemd files
Expand Down Expand Up @@ -77,7 +77,7 @@ endef
all-installable: cc-proxy $(UNIT_FILES)

install: all-installable
$(call INSTALL_EXEC,cc-proxy,$(LIBEXECDIR)/clearcontainers)
$(call INSTALL_EXEC,cc-proxy,$(LIBEXECDIR)/clear-containers)
$(foreach f,$(UNIT_FILES),$(call INSTALL_FILE,$f,$(UNIT_DIR)))

clean:
Expand Down
2 changes: 1 addition & 1 deletion cc-proxy.service.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Description=Clear Containers Proxy
Documentation=https://github.com/clearcontainers/proxy

[Service]
ExecStart=@libexecdir@/cc-proxy
ExecStart=@libexecdir@/clear-containers/cc-proxy

[Install]
WantedBy=multi-user.target
2 changes: 1 addition & 1 deletion cc-proxy.socket.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Documentation=https://github.com/clearcontainers/proxy
PartOf=cc-proxy.service

[Socket]
ListenStream=@localstatedir@/run/cc-oci-runtime/proxy.sock
ListenStream=@localstatedir@/run/clear-containers/proxy.sock
DirectoryMode=0770
SocketMode=0660

Expand Down