summaryrefslogtreecommitdiffstats
path: root/satellit_installer/includes
diff options
context:
space:
mode:
authorSimon Rettberg2021-04-16 20:47:48 +0200
committerSimon Rettberg2021-04-16 20:47:48 +0200
commitd833e5e297f81efbdc304c932ff9b62755eeaab5 (patch)
treec05733d524fc8cba9e4c16121f26246b57cbdaed /satellit_installer/includes
parent[SSPS] dnbd3 config: Lower bgrWindowSize, add prefetch config (diff)
downloadsetup-scripts-d833e5e297f81efbdc304c932ff9b62755eeaab5.tar.gz
setup-scripts-d833e5e297f81efbdc304c932ff9b62755eeaab5.tar.xz
setup-scripts-d833e5e297f81efbdc304c932ff9b62755eeaab5.zip
[SSPS] Fix/cleanup directory permission/owner setting
Diffstat (limited to 'satellit_installer/includes')
-rw-r--r--satellit_installer/includes/90-set_directory_permissions.inc36
1 files changed, 11 insertions, 25 deletions
diff --git a/satellit_installer/includes/90-set_directory_permissions.inc b/satellit_installer/includes/90-set_directory_permissions.inc
index fc211da..d9318d0 100644
--- a/satellit_installer/includes/90-set_directory_permissions.inc
+++ b/satellit_installer/includes/90-set_directory_permissions.inc
@@ -4,29 +4,20 @@
# Also, place for some last ditch copying of files, es this is executed near
# the end of script execution.
-set_directory_permissions() {
- mkdir -p -m 755 "$OPENSLXDIR" 2>/dev/null
+set_directory_permissions() (
+ set -x
+ mkdir -p "$OPENSLXDIR/configs/modules"
+ chmod 755 "$OPENSLXDIR/configs"
+ chown -R taskmanager:taskmanager "$OPENSLXDIR/configs"
- mkdir -p -m 755 "$OPENSLXDIR"/configs 2>/dev/null
- chmod 755 "$OPENSLXDIR"/configs 2>/dev/null # if already there
- chown -R taskmanager:taskmanager "$OPENSLXDIR"/configs
+ chmod 755 "$OPENSLXDIR/ipxe"
+ chown -R taskmanager:taskmanager "$OPENSLXDIR/ipxe"
- mkdir -p -m 755 "$OPENSLXDIR"/configs/modules 2>/dev/null
- chmod 755 "$OPENSLXDIR"/configs/modules 2>/dev/null # if already there
- chown -R taskmanager:taskmanager "$OPENSLXDIR"/configs/modules
-
- mkdir -p -m 755 "$OPENSLXDIR"/ipxe 2>/dev/null
- chmod 755 "$OPENSLXDIR"/ipxe 2>/dev/null # if already there
- chown -R taskmanager:www-data "$OPENSLXDIR"/ipxe
-
# Keep care with $OPENSLXDIR, as $OPENSLXDIR/nfs needs other permissions.
- mkdir -p -m 755 "$OPENSLXSRVDIR" 2>/dev/null
- chmod 775 "$OPENSLXSRVDIR" 2>/dev/null # if already there
- chown -R taskmanager:root "$OPENSLXSRVDIR"
- chown -R dmsd:images "$OPENSLXSRVDIR"/nfs
+ chmod 775 "$OPENSLXSRVDIR"
+ chown -R dmsd:images "$OPENSLXSRVDIR/nfs"
- mkdir -p -m 755 "$WWWDIR" 2>/dev/null
- chmod 755 "$WWWDIR" 2>/dev/null # if already there
+ chmod 755 "$WWWDIR"
chown -R root:root "$WWWDIR"
mkdir -p "$WWWDIR/boot/download"
@@ -35,11 +26,6 @@ set_directory_permissions() {
chown -R taskmanager "$TFTPDIR"
- mkdir -p -m 755 "$OPENSLXDIR"/proxy 2>/dev/null
- chmod 755 "$OPENSLXDIR"/proxy 2>/dev/null # if already there
- chown www-data "$OPENSLXDIR"/proxy 2>/dev/null
-
- mkdir -p -m 0755 "$SLXADMINCACHE"
chmod 0755 "$SLXADMINCACHE" # if already there
chown -R www-data:www-data "$SLXADMINCACHE"
-}
+)