Skip to content

Commit de8a668

Browse files
blagblag
committed
Fix configuration directory and file permissions
1 parent 40d278a commit de8a668

4 files changed

Lines changed: 28 additions & 76 deletions

File tree

‎scripts/includes/common.sh‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -181,34 +181,22 @@ configure_st2_cli_config() {
181181
CURRENT_USER_CLI_CONFIG_DIRECTORY="${HOME}/.st2"
182182
CURRENT_USER_CLI_CONFIG_PATH="${CURRENT_USER_CLI_CONFIG_DIRECTORY}/config"
183183

184-
if ! sudo test -d ${ROOT_USER_CLI_CONFIG_DIRECTORY}; then
185-
sudo mkdir -p ${ROOT_USER_CLI_CONFIG_DIRECTORY}
186-
fi
187-
188-
sudo sh -c "cat <<EOT > ${ROOT_USER_CLI_CONFIG_PATH}
189-
[credentials]
190-
username = ${USERNAME}
191-
password = ${PASSWORD}
192-
EOT"
184+
sudo st2 login --config-file ${ROOT_USER_CLI_CONFIG_PATH} \
185+
--write-password \
186+
--username ${USERNAME} --password ${PASSWORD}
193187

194188
# Write config for root user
195189
if [ "${CURRENT_USER}" == "${ROOT_USER}" ]; then
196190
return
197191
fi
198192

199193
# Write config for current user (in case current user != root)
200-
if [ ! -d ${CURRENT_USER_CLI_CONFIG_DIRECTORY} ]; then
201-
sudo mkdir -p ${CURRENT_USER_CLI_CONFIG_DIRECTORY}
202-
fi
203-
204-
sudo sh -c "cat <<EOT > ${CURRENT_USER_CLI_CONFIG_PATH}
205-
[credentials]
206-
username = ${USERNAME}
207-
password = ${PASSWORD}
208-
EOT"
194+
st2 login --config-file ${CURRENT_USER_CLI_CONFIG_PATH} \
195+
--write-password \
196+
--username ${USERNAME} --password ${PASSWORD}
209197

210198
# Fix the permissions
211-
sudo chown -R ${CURRENT_USER}:${CURRENT_USER} ${CURRENT_USER_CLI_CONFIG_DIRECTORY}
199+
chown -R ${CURRENT_USER}:${CURRENT_USER} ${CURRENT_USER_CLI_CONFIG_DIRECTORY}
212200
}
213201

214202

‎scripts/st2bootstrap-deb.sh‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -298,34 +298,22 @@ configure_st2_cli_config() {
298298
CURRENT_USER_CLI_CONFIG_DIRECTORY="${HOME}/.st2"
299299
CURRENT_USER_CLI_CONFIG_PATH="${CURRENT_USER_CLI_CONFIG_DIRECTORY}/config"
300300

301-
if ! sudo test -d ${ROOT_USER_CLI_CONFIG_DIRECTORY}; then
302-
sudo mkdir -p ${ROOT_USER_CLI_CONFIG_DIRECTORY}
303-
fi
304-
305-
sudo sh -c "cat <<EOT > ${ROOT_USER_CLI_CONFIG_PATH}
306-
[credentials]
307-
username = ${USERNAME}
308-
password = ${PASSWORD}
309-
EOT"
301+
sudo st2 login --config-file ${ROOT_USER_CLI_CONFIG_PATH} \
302+
--write-password \
303+
--username ${USERNAME} --password ${PASSWORD}
310304

311305
# Write config for root user
312306
if [ "${CURRENT_USER}" == "${ROOT_USER}" ]; then
313307
return
314308
fi
315309

316310
# Write config for current user (in case current user != root)
317-
if [ ! -d ${CURRENT_USER_CLI_CONFIG_DIRECTORY} ]; then
318-
sudo mkdir -p ${CURRENT_USER_CLI_CONFIG_DIRECTORY}
319-
fi
320-
321-
sudo sh -c "cat <<EOT > ${CURRENT_USER_CLI_CONFIG_PATH}
322-
[credentials]
323-
username = ${USERNAME}
324-
password = ${PASSWORD}
325-
EOT"
311+
st2 login --config-file ${CURRENT_USER_CLI_CONFIG_PATH} \
312+
--write-password \
313+
--username ${USERNAME} --password ${PASSWORD}
326314

327315
# Fix the permissions
328-
sudo chown -R ${CURRENT_USER}:${CURRENT_USER} ${CURRENT_USER_CLI_CONFIG_DIRECTORY}
316+
chown -R ${CURRENT_USER}:${CURRENT_USER} ${CURRENT_USER_CLI_CONFIG_DIRECTORY}
329317
}
330318

331319

‎scripts/st2bootstrap-el6.sh‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -293,34 +293,22 @@ configure_st2_cli_config() {
293293
CURRENT_USER_CLI_CONFIG_DIRECTORY="${HOME}/.st2"
294294
CURRENT_USER_CLI_CONFIG_PATH="${CURRENT_USER_CLI_CONFIG_DIRECTORY}/config"
295295

296-
if ! sudo test -d ${ROOT_USER_CLI_CONFIG_DIRECTORY}; then
297-
sudo mkdir -p ${ROOT_USER_CLI_CONFIG_DIRECTORY}
298-
fi
299-
300-
sudo sh -c "cat <<EOT > ${ROOT_USER_CLI_CONFIG_PATH}
301-
[credentials]
302-
username = ${USERNAME}
303-
password = ${PASSWORD}
304-
EOT"
296+
sudo st2 login --config-file ${ROOT_USER_CLI_CONFIG_PATH} \
297+
--write-password \
298+
--username ${USERNAME} --password ${PASSWORD}
305299

306300
# Write config for root user
307301
if [ "${CURRENT_USER}" == "${ROOT_USER}" ]; then
308302
return
309303
fi
310304

311305
# Write config for current user (in case current user != root)
312-
if [ ! -d ${CURRENT_USER_CLI_CONFIG_DIRECTORY} ]; then
313-
sudo mkdir -p ${CURRENT_USER_CLI_CONFIG_DIRECTORY}
314-
fi
315-
316-
sudo sh -c "cat <<EOT > ${CURRENT_USER_CLI_CONFIG_PATH}
317-
[credentials]
318-
username = ${USERNAME}
319-
password = ${PASSWORD}
320-
EOT"
306+
st2 login --config-file ${CURRENT_USER_CLI_CONFIG_PATH} \
307+
--write-password \
308+
--username ${USERNAME} --password ${PASSWORD}
321309

322310
# Fix the permissions
323-
sudo chown -R ${CURRENT_USER}:${CURRENT_USER} ${CURRENT_USER_CLI_CONFIG_DIRECTORY}
311+
chown -R ${CURRENT_USER}:${CURRENT_USER} ${CURRENT_USER_CLI_CONFIG_DIRECTORY}
324312
}
325313

326314

‎scripts/st2bootstrap-el7.sh‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -293,34 +293,22 @@ configure_st2_cli_config() {
293293
CURRENT_USER_CLI_CONFIG_DIRECTORY="${HOME}/.st2"
294294
CURRENT_USER_CLI_CONFIG_PATH="${CURRENT_USER_CLI_CONFIG_DIRECTORY}/config"
295295

296-
if ! sudo test -d ${ROOT_USER_CLI_CONFIG_DIRECTORY}; then
297-
sudo mkdir -p ${ROOT_USER_CLI_CONFIG_DIRECTORY}
298-
fi
299-
300-
sudo sh -c "cat <<EOT > ${ROOT_USER_CLI_CONFIG_PATH}
301-
[credentials]
302-
username = ${USERNAME}
303-
password = ${PASSWORD}
304-
EOT"
296+
sudo st2 login --config-file ${ROOT_USER_CLI_CONFIG_PATH} \
297+
--write-password \
298+
--username ${USERNAME} --password ${PASSWORD}
305299

306300
# Write config for root user
307301
if [ "${CURRENT_USER}" == "${ROOT_USER}" ]; then
308302
return
309303
fi
310304

311305
# Write config for current user (in case current user != root)
312-
if [ ! -d ${CURRENT_USER_CLI_CONFIG_DIRECTORY} ]; then
313-
sudo mkdir -p ${CURRENT_USER_CLI_CONFIG_DIRECTORY}
314-
fi
315-
316-
sudo sh -c "cat <<EOT > ${CURRENT_USER_CLI_CONFIG_PATH}
317-
[credentials]
318-
username = ${USERNAME}
319-
password = ${PASSWORD}
320-
EOT"
306+
st2 login --config-file ${CURRENT_USER_CLI_CONFIG_PATH} \
307+
--write-password \
308+
--username ${USERNAME} --password ${PASSWORD}
321309

322310
# Fix the permissions
323-
sudo chown -R ${CURRENT_USER}:${CURRENT_USER} ${CURRENT_USER_CLI_CONFIG_DIRECTORY}
311+
chown -R ${CURRENT_USER}:${CURRENT_USER} ${CURRENT_USER_CLI_CONFIG_DIRECTORY}
324312
}
325313

326314

0 commit comments

Comments
 (0)