mirror of
https://github.com/flynx/proxmox-utils.git
synced 2025-10-29 11:10:09 +00:00
tweaks...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
parent
52c11ba2b2
commit
788d2f199f
@ -28,9 +28,9 @@ DNS := 10.1.1.1
|
|||||||
$(SERVER_CONF): $(SERVER_TPL) $(SERVER_KEY)
|
$(SERVER_CONF): $(SERVER_TPL) $(SERVER_KEY)
|
||||||
cat $< \
|
cat $< \
|
||||||
| sed \
|
| sed \
|
||||||
-e 's/$${SERVER_PORT}/$(SERVER_PORT)/g' \
|
-e 's/\$${ENDPOINT_PORT}/$(SERVER_PORT)/g' \
|
||||||
-e 's/$${CLIENT_IPS}/$(CLIENT_IPS)/g' \
|
-e 's/\$${CLIENT_IPS}/$(subst /,\/,$(CLIENT_IPS))/g' \
|
||||||
-e 's/$${SERVER_PRIVATE_KEY}/'$$(cat "$(SERVER_KEY)")'/g' \
|
-e 's/\$${SERVER_PRIVATE_KEY}/'$$(cat "$(subst /,\/,$(SERVER_KEY))")'/g' \
|
||||||
> "$@"
|
> "$@"
|
||||||
|
|
||||||
$(CLIENT_DIR)/%.conf: $(CLIENT_TPL) $(SERVER_CLIENT_TPL) \
|
$(CLIENT_DIR)/%.conf: $(CLIENT_TPL) $(SERVER_CLIENT_TPL) \
|
||||||
@ -39,21 +39,21 @@ $(CLIENT_DIR)/%.conf: $(CLIENT_TPL) $(SERVER_CLIENT_TPL) \
|
|||||||
@ mkdir -p $$(dirname $@)
|
@ mkdir -p $$(dirname $@)
|
||||||
cat "$<" \
|
cat "$<" \
|
||||||
| sed \
|
| sed \
|
||||||
-e 's/$${DNS}/$(DNS)/g' \
|
-e 's/\$${DNS}/$(DNS)/g' \
|
||||||
-e 's/$${ENDPOINT}/$(ENDPOINT)/g' \
|
-e 's/\$${ENDPOINT}/$(ENDPOINT)/g' \
|
||||||
-e 's/$${ENDPOINT_PORT}/$(ENDPOINT_PORT)/g' \
|
-e 's/\$${ENDPOINT_PORT}/$(ENDPOINT_PORT)/g' \
|
||||||
-e 's/$${ALLOWED_IPS}/$(ALLOWED_IPS)/g' \
|
-e 's/\$${ALLOWED_IPS}/$(subst /,\/,$(ALLOWED_IPS))/g' \
|
||||||
-e 's/$${CLIENT_IP}/$(CLIENT_IP)/g' \
|
-e 's/\$${CLIENT_IP}/$(subst /,\/,$(CLIENT_IP))/g' \
|
||||||
-e 's/$${CLIENT_PRIVATE_KEY}/'$$(cat "$(CLIENT_DIR)/$%_id")'/g' \
|
-e 's/\$${CLIENT_PRIVATE_KEY}/'$$(cat "$(subst /,\/,$(CLIENT_DIR))/$%_id")'/g' \
|
||||||
-e 's/$${SERVER_PUBLIC_KEY}/'$$(cat "$(SERVER_PUBLIC_KEY)")'/g' \
|
-e 's/\$${SERVER_PUBLIC_KEY}/'$$(cat "$(subst /,\/,$(SERVER_PUBLIC_KEY))")'/g' \
|
||||||
> "$@"
|
> "$@"
|
||||||
cat "$(SERVER_CLIENT_TPL)" \
|
cat "$(SERVER_CLIENT_TPL)" \
|
||||||
| sed \
|
| sed \
|
||||||
-e 's/$${CLIENT_IP}/$(CLIENT_IP)/g' \
|
-e 's/\$${CLIENT_IP}/$(subst /,\/,$(CLIENT_IP))/g' \
|
||||||
-e 's/$${ENDPOINT}/$(ENDPOINT)/g' \
|
-e 's/\$${ENDPOINT}/$(ENDPOINT)/g' \
|
||||||
-e 's/$${ENDPOINT_PORT}/$(ENDPOINT_PORT)/g' \
|
-e 's/\$${ENDPOINT_PORT}/$(ENDPOINT_PORT)/g' \
|
||||||
-e 's/$${CLIENT_PUBLIC_KEY}/'$$(cat "$(CLIENT_DIR)/$%_id.pub")'/g' \
|
-e 's/\$${CLIENT_PUBLIC_KEY}/'$$(cat "$(subst /,\/,$(CLIENT_DIR))/$%_id.pub")'/g' \
|
||||||
-e 's/$${SERVER_PUBLIC_KEY}/'$$(cat "$(SERVER_PUBLIC_KEY)")'/g' \
|
-e 's/\$${SERVER_PUBLIC_KEY}/'$$(cat "$(subst /,\/,$(SERVER_PUBLIC_KEY))")'/g' \
|
||||||
>> "$(SERVER_CONF)"
|
>> "$(SERVER_CONF)"
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user