fix: 修复 placement 配置文件权限块追加时的粘连与换行问题
This commit is contained in:
1 parent
f97ea36872
commit
af2c88a682
1 file changed
+6
@@ -413,8 +413,14 @@ if [ ! -f "$PLACEMENT_HTTPD_CONF" ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
backup_config "$PLACEMENT_HTTPD_CONF"
|
backup_config "$PLACEMENT_HTTPD_CONF"
|
||||||
|
# 兼容旧脚本:原配置末尾缺少换行时,块标记可能粘在 </Location> 等标签后。
|
||||||
|
# 先拆开粘连的标记,确保下面的范围删除能完整清理旧权限块。
|
||||||
|
sed -i 's/># BEGIN env3-4 placement access$/>\
|
||||||
|
# BEGIN env3-4 placement access/' "$PLACEMENT_HTTPD_CONF"
|
||||||
# 只替换本脚本管理的配置块,保留软件包提供的 VirtualHost / WSGI 配置。
|
# 只替换本脚本管理的配置块,保留软件包提供的 VirtualHost / WSGI 配置。
|
||||||
sed -i '/^# BEGIN env3-4 placement access$/,/^# END env3-4 placement access$/d' "$PLACEMENT_HTTPD_CONF"
|
sed -i '/^# BEGIN env3-4 placement access$/,/^# END env3-4 placement access$/d' "$PLACEMENT_HTTPD_CONF"
|
||||||
|
# 显式分隔原配置与追加块,避免无末尾换行的配置产生 </Location># 等错误。
|
||||||
|
printf '\n' >> "$PLACEMENT_HTTPD_CONF"
|
||||||
cat >> "$PLACEMENT_HTTPD_CONF" <<'EOF'
|
cat >> "$PLACEMENT_HTTPD_CONF" <<'EOF'
|
||||||
# BEGIN env3-4 placement access
|
# BEGIN env3-4 placement access
|
||||||
<Directory /usr/bin>
|
<Directory /usr/bin>
|
||||||
|
|||||||
Reference in new issue
Block a user