Skip to content

Commit

Permalink
Use bash-functions v0.1.8
Browse files Browse the repository at this point in the history
Now allowing custom local backup location
  • Loading branch information
Nicolas North committed Apr 8, 2018
1 parent f2f6107 commit 7decd28
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions functions
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

### openspace bash-framework v0.1.3 [https://github.com/openspace42/bash-framework]

os_bash_functions_version=0.1.7
os_bash_functions_version=0.1.8

################################################################################

Expand Down Expand Up @@ -170,7 +170,7 @@ aenigma-install_ejabberd_config() {
if [ $config_option = 1 ]
then
sed -i "s|example.im|${domain}|g" $source_dir/conf/ejabberd/ejabberd-tlsaddition-domain.txt
sed -i "s|pathtofile|${domtlscertloc}|g" $source_dir/conf/ejabberd/ejabberd-tlsaddition-domain.txt
sed -i "s|pathtofile|${domain_tls_cert_location}|g" $source_dir/conf/ejabberd/ejabberd-tlsaddition-domain.txt
sed -i '/## aenigma_host_config_domain_placeholder_start:/,/## aenigma_host_config_domain_placeholder_end:/{//!d}' $source_dir/conf/ejabberd/ejabberd.yml
sed -i "/## aenigma_host_config_domain_placeholder_start:/ r $source_dir/conf/ejabberd/ejabberd-tlsaddition-domain.txt" $source_dir/conf/ejabberd/ejabberd.yml
fi
Expand Down Expand Up @@ -778,8 +778,8 @@ perform_installation() {
done
fi

domtlscertloc="$tls_dir/$domain.pem"
echo "$domtlscertloc" > "$conf_dir/domtlscertloc"
domain_tls_cert_location="$tls_dir/$domain.pem"
echo "$domain_tls_cert_location" > "$conf_dir/domain_tls_cert_location"

fi

Expand Down Expand Up @@ -1250,7 +1250,7 @@ perform_installation() {
touch $tls_dir/domain.pem
cat /etc/letsencrypt/live/"$domain"/privkey.pem > "$tls_dir"/domain.pem
cat /etc/letsencrypt/live/"$domain"/fullchain.pem >> "$tls_dir"/domain.pem
domtlscertloc=$tls_dir/domain.pem
domain_tls_cert_location=$tls_dir/domain.pem
echo "${b}Finished creating all-in-one TLS file for $domain for ejabberd...${x}"
echo

Expand Down
8 changes: 4 additions & 4 deletions tools/aenigma-backup
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ os-br_backup_locally "${skip_install_complete_check-}"

################################################################################

if [ "$backup_location" = "s3" ]
if [ "$backup_archival_location" = "s3" ]
then

mv "$tmp_backup_dir"/* "$backups_latest_dir"
mv "$tmp_backup_dir"/* "$backup_local_storage_path/latest"

############################################################################

Expand All @@ -88,9 +88,9 @@ else

fi

if [ -d "$tmp_dir" ]
if [ -d "$backup_local_storage_path/temp" ]
then
rm -r "${tmp_dir:?}"
rm -r "${backup_local_storage_path:?}/temp"
fi

os-br_purge_dirs
Expand Down

0 comments on commit 7decd28

Please sign in to comment.