Skip to content
Snippets Groups Projects
Commit a9f1db72 authored by Bob Mottram's avatar Bob Mottram
Browse files

No braces

parent dea8b96b
No related branches found
No related tags found
No related merge requests found
...@@ -188,11 +188,13 @@ function create_etherpad_settings { ...@@ -188,11 +188,13 @@ function create_etherpad_settings {
function remove_user_etherpad { function remove_user_etherpad {
remove_username="$1" remove_username="$1"
read_config_param ETHERPAD_DOMAIN_NAME read_config_param ETHERPAD_DOMAIN_NAME
${PROJECT_NAME}-pass -u $remove_username --rmapp etherpad ${PROJECT_NAME}-pass -u $remove_username --rmapp etherpad
if ! grep -q "\"${remove_username}\": {" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json; then if ! grep -q "\"$remove_username\": {" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json; then
sed -i "/\"${remove_username}\": {/,/},/d" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json sed -i "/\"$remove_username\": {/,/},/d" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
fi fi
} }
...@@ -201,8 +203,8 @@ function add_user_etherpad { ...@@ -201,8 +203,8 @@ function add_user_etherpad {
new_user_password="$2" new_user_password="$2"
${PROJECT_NAME}-pass -u $new_username -a etherpad -p "$new_user_password" ${PROJECT_NAME}-pass -u $new_username -a etherpad -p "$new_user_password"
read_config_param ETHERPAD_DOMAIN_NAME read_config_param ETHERPAD_DOMAIN_NAME
if ! grep -q "\"${new_username}\": {" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json; then if ! grep -q "\"$new_username\": {" /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json; then
sed -i "/\"users\": {/a \"${new_username}\": { \"password\": \"${new_user_password}\", \"is_admin\": false }," /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json sed -i "/\"users\": {/a \"$new_username\": { \"password\": \"$new_user_password\", \"is_admin\": false }," /var/www/${ETHERPAD_DOMAIN_NAME}/htdocs/settings.json
fi fi
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment