free
/
freedomboneeee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove movim on xmpp uninstall

This commit is contained in:
Bob Mottram 2017-05-19 15:55:38 +01:00
parent adc20c9e0c
commit edd0e53d89
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/freedombone-app-movim
View File

@ -28,7 +28,7 @@
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
VARIANTS='full full-vim chat' VARIANTS='full full-vim social'
IN_DEFAULT_INSTALL=0 IN_DEFAULT_INSTALL=0
SHOW_ON_ABOUT=1 SHOW_ON_ABOUT=1
@ -225,8 +225,6 @@ function backup_remote_movim {
function_check backup_database_to_friend function_check backup_database_to_friend
backup_database_to_friend movim backup_database_to_friend movim
echo $"Backing up GNU social installation"
function_check backup_directory_to_friend function_check backup_directory_to_friend
backup_directory_to_friend $temp_backup_dir movim backup_directory_to_friend $temp_backup_dir movim
@ -260,6 +258,9 @@ function restore_remote_movim {
} }
function remove_movim { function remove_movim {
if [[ $(app_is_installed movim) == "0" ]]; then
return
fi
read_config_param "MOVIM_DOMAIN_NAME" read_config_param "MOVIM_DOMAIN_NAME"
if [ ${#MOVIM_DOMAIN_NAME} -eq 0 ]; then if [ ${#MOVIM_DOMAIN_NAME} -eq 0 ]; then
return return
@ -298,6 +299,10 @@ function install_movim {
exit 72572 exit 72572
fi fi
if [[ $(app_is_installed xmpp) == "0" ]]; then
return
fi
movim_hourly_script movim $MOVIM_DOMAIN_NAME movim_hourly_script movim $MOVIM_DOMAIN_NAME
function_check install_mariadb function_check install_mariadb

1
src/freedombone-app-xmpp
View File

@ -498,6 +498,7 @@ function configure_firewall_for_xmpp {
function remove_xmpp { function remove_xmpp {
remove_profanity remove_profanity
remove_movim
firewall_remove 5222 tcp firewall_remove 5222 tcp
firewall_remove 5223 tcp firewall_remove 5223 tcp
firewall_remove 5269 tcp firewall_remove 5269 tcp