aboutsummaryrefslogtreecommitdiff
path: root/debian/gnunet.postinst
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-12-30 09:39:03 +0100
committerChristian Grothoff <christian@grothoff.org>2020-12-30 09:39:03 +0100
commit1f489833705ee9fc66686ed3045cc5dba56dfd39 (patch)
tree92e8b26b1bc17f898a5d45f4e303673509a1102a /debian/gnunet.postinst
parent8dca171ad616800dc8b5632a872f832a663f8dbb (diff)
downloadgnunet-1f489833705ee9fc66686ed3045cc5dba56dfd39.tar.gz
gnunet-1f489833705ee9fc66686ed3045cc5dba56dfd39.zip
fix postinst to ensure gnunet.conf is owned by grothoff after using gnunet-config
Diffstat (limited to 'debian/gnunet.postinst')
-rw-r--r--debian/gnunet.postinst22
1 files changed, 11 insertions, 11 deletions
diff --git a/debian/gnunet.postinst b/debian/gnunet.postinst
index 902b93fd7..07e5202e8 100644
--- a/debian/gnunet.postinst
+++ b/debian/gnunet.postinst
@@ -106,7 +106,7 @@ case "${1}" in
106 fi 106 fi
107 fi 107 fi
108 echo " done." 108 echo " done."
109 fi 109 fi
110 110
111 # Install GNUnet configuration for all users provided non exists 111 # Install GNUnet configuration for all users provided non exists
112 userlist=$(awk -F ':' '$3>=1000 && $3<2000 {print $1}' /etc/passwd) 112 userlist=$(awk -F ':' '$3>=1000 && $3<2000 {print $1}' /etc/passwd)
@@ -117,9 +117,9 @@ case "${1}" in
117 for (( i=0; i<${#users[@]}; i++ )); do 117 for (( i=0; i<${#users[@]}; i++ )); do
118 usermod -aG gnunet ${users[$i]} 118 usermod -aG gnunet ${users[$i]}
119 if [ -n "$i" ] && [ -d "${homedirs[$i]}" ]; then 119 if [ -n "$i" ] && [ -d "${homedirs[$i]}" ]; then
120 mkdir -p ${homedirs[$i]}/.config/systemd/user/ 120 mkdir -p ${homedirs[$i]}/.config/systemd/user/
121 121
122 cat > "${homedirs[$i]}/.config/systemd/user/gnunet-user.service" << EOF 122 cat > "${homedirs[$i]}/.config/systemd/user/gnunet-user.service" << EOF
123# Copyright (C) 2019 GNUnet e.V. 123# Copyright (C) 2019 GNUnet e.V.
124# 124#
125# Copying and distribution of this file, with or without modification, 125# Copying and distribution of this file, with or without modification,
@@ -140,12 +140,11 @@ ExecStop=/usr/bin/gnunet-arm -e -c ${homedirs[$i]}/.config/gnunet.conf
140WantedBy=multi-user.target 140WantedBy=multi-user.target
141EOF 141EOF
142 142
143 chown "${users[$i]}":"${users[$i]}" "${homedirs[$i]}/.config/systemd/user/gnunet-user.service" 143 chown "${users[$i]}":"${users[$i]}" "${homedirs[$i]}/.config/systemd/user/gnunet-user.service"
144 if [ ! -f "${homedirs[$i]}/.config/gnunet.conf" ]; then 144 if [ ! -f "${homedirs[$i]}/.config/gnunet.conf" ]; then
145 mkdir -p ${homedirs[$i]}/.config/ 145 mkdir -p ${homedirs[$i]}/.config/
146 cp /etc/skel/.config/gnunet.conf "${homedirs[$i]}/.config/gnunet.conf" 146 cp /etc/skel/.config/gnunet.conf "${homedirs[$i]}/.config/gnunet.conf"
147 chmod 644 "${homedirs[$i]}/.config/gnunet.conf" 147 chmod 644 "${homedirs[$i]}/.config/gnunet.conf"
148 chown "${users[$i]}":"${users[$i]}" "${homedirs[$i]}/.config/gnunet.conf"
149 fi 148 fi
150 fi 149 fi
151 port=$((8000+$(id -u "${users[$i]}"))) 150 port=$((8000+$(id -u "${users[$i]}")))
@@ -158,12 +157,13 @@ EOF
158 --rewrite \ 157 --rewrite \
159 --section=gns-proxy \ 158 --section=gns-proxy \
160 --option=OPTIONS \ 159 --option=OPTIONS \
161 --value="-p $port" 160 --value="-p $port"
161 chown "${users[$i]}":"${users[$i]}" "${homedirs[$i]}/.config/gnunet.conf"
162 done 162 done
163 163
164 # Change the proxy settings for Firefox and Chromium if desired 164 # Change the proxy settings for Firefox and Chromium if desired
165 if ${_PROXY} 165 if ${_PROXY}
166 then 166 then
167 mkdir -p /etc/X11/xinit/xinitrc.d/ 167 mkdir -p /etc/X11/xinit/xinitrc.d/
168cat > "/etc/X11/xinit/xinitrc.d/80-gnunet-user-services" << "EOF" 168cat > "/etc/X11/xinit/xinitrc.d/80-gnunet-user-services" << "EOF"
169#!/bin/bash 169#!/bin/bash
@@ -219,7 +219,7 @@ fi
219gnunet-gns-proxy-setup-ca 219gnunet-gns-proxy-setup-ca
220EOF 220EOF
221 fi 221 fi
222 222
223 # Update files and directories permissions. 223 # Update files and directories permissions.
224 # Assuming default values, this *should* not be changed. 224 # Assuming default values, this *should* not be changed.
225 echo -n "Updating files and directories permissions:" 225 echo -n "Updating files and directories permissions:"