This repository was archived by the owner on Feb 27, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 9
Attempt to port the actions from the AIO in proper charms #41
Open
thomnico
wants to merge
2
commits into
Metaswitch:trusty
Choose a base branch
from
thomnico:trusty
base: trusty
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| create-update-user: | ||
| description: Create a user, or update a user if they already exist. | ||
| params: | ||
| number: | ||
| description: The number to provision | ||
| type: string | ||
| password: | ||
| description: The number's password | ||
| type: string | ||
| required: [number, password] | ||
| additionalProperties: false | ||
| delete-user: | ||
| description: Delete a user. If the user does not exist, this is still considered success. | ||
| params: | ||
| number: | ||
| description: The number to provision | ||
| type: string | ||
| required: [number] | ||
| additionalProperties: false |
18 changes: 18 additions & 0 deletions
18
charms/trusty/clearwater-homestead/actions/create-update-user
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| #!/bin/bash | ||
| set -ex | ||
|
|
||
| # Get the configuration and action parameters. | ||
| home_domain=$(config-get zone) | ||
| number=$(action-get number) | ||
| password=$(action-get password) | ||
|
|
||
|
|
||
| # If the user doesn't exist, try to create them. Otherwise, try to update them. | ||
| if ! sudo -S /usr/share/clearwater/bin/display_user $number $home_domain ; | ||
| then | ||
| echo "Subscriber doesn't exist - creating" | ||
| sudo -S /usr/share/clearwater/bin/create_user $number $home_domain $password | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. (Minor) indentation. |
||
| else | ||
| echo "Subscriber exists - updating" | ||
| sudo -S /usr/share/clearwater/bin/update_user $number $home_domain --password $password | ||
| fi | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| #!/bin/bash | ||
| set -e | ||
|
|
||
| # Get the configuration and action parameters. | ||
| home_domain=$(config-get zone) | ||
| number=$(action-get number) | ||
|
|
||
| # Delete the user. | ||
| sudo -S /usr/share/clearwater/bin/delete_user -y $number $home_domain |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why
sudo -S(specifically the-S)? We're not providing a username or password here. Surely if the current user is not already authenticated, there's no way we can succeed?