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

Consistant gnusocial naming

This commit is contained in:
Bob Mottram 2016-07-06 08:05:26 +01:00
parent 5fb34df806
commit e96cd9134b
3 changed files with 545 additions and 545 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/freedombone-app-gnusocial
View File

@ -276,9 +276,9 @@ function install_gnusocial_main {
# NOTE: For the typical case always enable SSL and only
# disable it if in onion only mode. This is due to complexities
# with the way URLs are generated by GNU Social
gnu_social_ssl='always'
gnusocial_ssl='always'
if [[ $ONION_ONLY != 'no' ]]; then
gnu_social_ssl='never'
gnusocial_ssl='never'
fi
MICROBLOG_ONION_HOSTNAME=$(add_onion_service microblog 80 ${MICROBLOG_ONION_PORT})
@ -289,12 +289,12 @@ function install_gnusocial_main {
fi
# Create the configuration
gnu_social_installer=/var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/scripts/install_cli.php
if [ ! -f $gnu_social_installer ]; then
gnusocial_installer=/var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/scripts/install_cli.php
if [ ! -f $gnusocial_installer ]; then
echo $'No GNU Social commandline installer found'
exit 53026
fi
${gnu_social_installer} --server "${MICROBLOG_SERVER}" \
${gnusocial_installer} --server "${MICROBLOG_SERVER}" \
--host="localhost" --database="gnusocial" \
--dbtype=mysql --username="root" -v \
--password="$MARIADB_PASSWORD" \
@ -302,7 +302,7 @@ function install_gnusocial_main {
--admin-nick="$MY_USERNAME" \
--admin-pass="$MICROBLOG_ADMIN_PASSWORD" \
--site-profile="community" \
--ssl=${gnu_social_ssl}
--ssl=${gnusocial_ssl}
# There can be a lot of warnings here so the return value check is disabled
#if [ ! "$?" = "0" ]; then
# # failed to install
@ -475,7 +475,7 @@ function install_gnusocial_plugin_sharings_theme {
echo 'install_gnusocial_plugin_sharings_theme' >> $COMPLETION_FILE
}
function expire_gnu_social_posts {
function expire_gnusocial_posts {
# To prevent the database size from growing endlessly this script expires posts
# after a number of months
if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
@ -686,7 +686,7 @@ function install_gnusocial {
return
fi
install_gnusocial_main
expire_gnu_social_posts
expire_gnusocial_posts
install_gnusocial_theme
install_gnusocial_markdown
install_gnusocial_plugin_sharings

4
src/freedombone-restore-local
View File

@ -829,7 +829,7 @@ function restore_xmpp {
fi
}
function restore_gnu_social {
function restore_gnusocial {
if [[ $RESTORE_APP != 'all' ]]; then
if [[ $RESTORE_APP != 'gnusocial' ]]; then
return
@ -1276,7 +1276,7 @@ restore_certs
restore_personal_settings
restore_mailing_list
restore_xmpp
restore_gnu_social
restore_gnusocial
restore_hubzilla
restore_rss
restore_syncthing

4
src/freedombone-restore-remote
View File

@ -693,7 +693,7 @@ function restore_xmpp {
fi
}
function restore_gnu_social {
function restore_gnusocial {
if [[ $RESTORE_APP != 'all' ]]; then
if [[ $RESTORE_APP != 'gnusocial' ]]; then
return
@ -1116,7 +1116,7 @@ restore_certs
restore_personal_settings
restore_mailing_list
restore_xmpp
restore_gnu_social
restore_gnusocial
restore_hubzilla
restore_rss
restore_syncthing