Skip to content

Commit 7a6a4ed

Browse files
committed
fix session paths
1 parent fe9dd6a commit 7a6a4ed

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

rootfs/container/functions/20-llng

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ llng_bootstrap_global_configuration() {
4545
if dir_empty "${conf_dir}/" ; then
4646
cp -aR /container/data/llng/conf/lmConf-1.json "${conf_dir}/"
4747
print_debug "Bootstrapping Initial Configuration"
48-
sudo -u "${NGINX_USER}" jq '
48+
jq '
4949
del(
5050
.applicationList["1sample"].test2
5151
.exportedHeaders["test2.example.com"],
@@ -56,9 +56,9 @@ llng_bootstrap_global_configuration() {
5656
.locationRules["test2.example.com"],
5757
.persistentStorage,
5858
.persistentStorageOptions.Directory,
59-
.persistentStorageOptions.LockDirectory,
59+
.persistentStorageOptions.LockDirectory
6060
)
61-
' "${conf_file}"
61+
' /container/data/llng/conf/lmConf-1.json | silent sudo -u "${NGINX_USER}" tee "${conf_file}"
6262
sudo -u "${NGINX_USER}" sed -i \
6363
-e "s|example.com|${DOMAIN_NAME}|g" \
6464
"${conf_file}"
@@ -190,7 +190,7 @@ llng_configure_handler() {
190190
"file" )
191191
create_folder \
192192
"${HANDLER_SESSIONS_ACTIVE_PATH},\
193-
${HANDLER_SESSIONS_ACTIVE_PATH}/lock" \
193+
${HANDLER_SESSIONS_ACTIVE_PATH}/lock" \
194194
"${NGINX_USER}":"${NGINX_GROUP}" 750
195195

196196
handler_lines+=(
@@ -207,7 +207,7 @@ llng_configure_handler() {
207207
"file" )
208208
create_folder \
209209
"${HANDLER_SESSIONS_PERSISTENT_PATH},\
210-
${HANDLER_SESSIONS_PERSISTENT_PATH}/lock" \
210+
${HANDLER_SESSIONS_PERSISTENT_PATH}/lock" \
211211
"${NGINX_USER}":"${NGINX_GROUP}" 750
212212
handler_lines+=(
213213
"persistentStorage = Apache::Session::File"
@@ -255,8 +255,8 @@ llng_configure_instance() {
255255
case "${INSTANCE_SESSIONS_ACTIVE_TYPE,,}" in
256256
"file" )
257257
create_folder \
258-
"${INSTANCE_SESSIONS_ACTIVE_PATH},\
259-
${INSTANCE_SESSIONS_ACTIVE_PATH}/lock" \
258+
"${INSTANCE_SESSIONS_ACTIVE_FILE_PATH},\
259+
${INSTANCE_SESSIONS_ACTIVE_FILE_PATH}/lock" \
260260
"${NGINX_USER}":"${NGINX_GROUP}" 750
261261

262262
instance_lines+=(
@@ -272,8 +272,8 @@ llng_configure_instance() {
272272
case "${INSTANCE_SESSIONS_PERSISTENT_TYPE,,}" in
273273
"file" )
274274
create_folder \
275-
"${INSTANCE_SESSIONS_PERSISTENT_PATH},\
276-
${INSTANCE_SESSIONS_PERSISTENT_PATH}/lock" \
275+
"${INSTANCE_SESSIONS_PERSISTENT_FILE_PATH},\
276+
${INSTANCE_SESSIONS_PERSISTENT_FILE_PATH}/lock" \
277277
"${NGINX_USER}":"${NGINX_GROUP}" 750
278278
instance_lines+=(
279279
"persistentStorage = Apache::Session::File"

0 commit comments

Comments
 (0)