Deprecate the owncloud music app
It's trivial to install with one click if you want it
This commit is contained in:
Bob Mottram
parent
f0a33bacf4
commit
3dcbbdb7d8
|
|
@ -232,8 +232,6 @@ OWNCLOUD_DOMAIN_NAME=
|
|||
OWNCLOUD_CODE=
|
||||
OWNCLOUD_ONION_PORT=8088
|
||||
OWNCLOUD_ADMIN_PASSWORD=
|
||||
OWNCLOUD_MUSIC_APP_REPO="https://github.com/owncloud/music"
|
||||
OWNCLOUD_MUSIC_APP_COMMIT='0c0e1fadbe31a43f9c98d6a2a7b3960ff881ca0e'
|
||||
OWNCLOUD_PATH=/var/www/owncloud
|
||||
OWNCLOUD_UPGRADE_PATH=/root/owncloud_upgrade
|
||||
|
||||
|
|
@ -1134,9 +1132,6 @@ function read_configuration {
|
|||
if grep -q "GPGIT_COMMIT" $CONFIGURATION_FILE; then
|
||||
GPGIT_COMMIT=$(grep "GPGIT_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
||||
fi
|
||||
if grep -q "OWNCLOUD_MUSIC_APP_COMMIT" $CONFIGURATION_FILE; then
|
||||
OWNCLOUD_MUSIC_APP_COMMIT=$(grep "OWNCLOUD_MUSIC_APP_COMMIT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
||||
fi
|
||||
if grep -q "HUBZILLA_REPO" $CONFIGURATION_FILE; then
|
||||
HUBZILLA_REPO=$(grep "HUBZILLA_REPO" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
||||
fi
|
||||
|
|
@ -6392,50 +6387,6 @@ function repair_databases_script {
|
|||
echo 'repair_databases_script' >> $COMPLETION_FILE
|
||||
}
|
||||
|
||||
function install_owncloud_repo_music_app {
|
||||
if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
|
||||
return
|
||||
fi
|
||||
|
||||
if ! grep -Fxq "install_owncloud_official_deb" $COMPLETION_FILE; then
|
||||
echo $'Tried to install the Owncloud music app, but Owncloud installation was not found'
|
||||
exit 9823
|
||||
fi
|
||||
|
||||
# update to the next commit
|
||||
set_repo_commit $OWNCLOUD_PATH/apps/music "Owncloud music app commit" "$OWNCLOUD_MUSIC_APP_COMMIT" $OWNCLOUD_MUSIC_APP_REPO
|
||||
|
||||
if grep -Fxq "install_owncloud_repo_music_app" $COMPLETION_FILE; then
|
||||
return
|
||||
fi
|
||||
|
||||
cd $OWNCLOUD_PATH/apps
|
||||
git_clone $OWNCLOUD_MUSIC_APP_REPO Music
|
||||
cd $OWNCLOUD_PATH/apps/Music
|
||||
git checkout $OWNCLOUD_MUSIC_APP_COMMIT -b $OWNCLOUD_MUSIC_APP_COMMIT
|
||||
if ! grep -q "Owncloud music app commit" $COMPLETION_FILE; then
|
||||
echo "Owncloud music app commit:$OWNCLOUD_MUSIC_APP_COMMIT" >> $COMPLETION_FILE
|
||||
else
|
||||
sed -i "s/Owncloud music app commit.*/Owncloud music app commit:$OWNCLOUD_MUSIC_APP_COMMIT/g" $COMPLETION_FILE
|
||||
fi
|
||||
|
||||
if grep -q $"Music player in Owncloud" /home/$MY_USERNAME/README; then
|
||||
echo '' >> /home/$MY_USERNAME/README
|
||||
echo '' >> /home/$MY_USERNAME/README
|
||||
echo $'Music player in Owncloud' >> /home/$MY_USERNAME/README
|
||||
echo '========================' >> /home/$MY_USERNAME/README
|
||||
echo $'To enable the music app within ouwncloud log in to the Owncloud' >> /home/$MY_USERNAME/README
|
||||
echo $'administrator account then go to Apps on the left hand dropdown' >> /home/$MY_USERNAME/README
|
||||
echo $'menu and enable the music app. You can then log out and log back' >> /home/$MY_USERNAME/README
|
||||
echo $'in as your Owncloud user and select music from the left hand' >> /home/$MY_USERNAME/README
|
||||
echo $'dropdown menu.' >> /home/$MY_USERNAME/README
|
||||
chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
|
||||
chmod 600 /home/$MY_USERNAME/README
|
||||
fi
|
||||
|
||||
echo 'install_owncloud_repo_music_app' >> $COMPLETION_FILE
|
||||
}
|
||||
|
||||
function add_ddns_domain {
|
||||
if [[ $ONION_ONLY != "no" ]]; then
|
||||
return
|
||||
|
|
@ -6570,7 +6521,6 @@ function install_owncloud_official_deb {
|
|||
OWNCLOUD_COMPLETION_MSG2=$"Open $OWNCLOUD_DOMAIN_NAME in a web browser to complete the setup"
|
||||
if grep -Fxq "install_owncloud_official_deb" $COMPLETION_FILE; then
|
||||
if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" ]]; then
|
||||
install_owncloud_repo_music_app
|
||||
backup_to_friends_servers
|
||||
intrusion_detection
|
||||
split_gpg_key_into_fragments
|
||||
|
|
@ -6865,7 +6815,6 @@ function install_owncloud_official_deb {
|
|||
echo 'install_owncloud_official_deb' >> $COMPLETION_FILE
|
||||
|
||||
if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" ]]; then
|
||||
install_owncloud_repo_music_app
|
||||
backup_to_friends_servers
|
||||
intrusion_detection
|
||||
split_gpg_key_into_fragments
|
||||
|
|
@ -7667,19 +7616,19 @@ function install_watchdog_script {
|
|||
return
|
||||
fi
|
||||
echo '#!/bin/bash' > /usr/bin/$WATCHDOG_SCRIPT_NAME
|
||||
echo 'LOGFILE=/var/log/keepon.log' >> /usr/bin/$WATCHDOG_SCRIPT_NAME
|
||||
echo 'CURRENT_DATE=$(date)' >> /usr/bin/$WATCHDOG_SCRIPT_NAME
|
||||
# application specific stuff is added later
|
||||
chmod +x /usr/bin/$WATCHDOG_SCRIPT_NAME
|
||||
echo 'LOGFILE=/var/log/keepon.log' >> /usr/bin/$WATCHDOG_SCRIPT_NAME
|
||||
echo 'CURRENT_DATE=$(date)' >> /usr/bin/$WATCHDOG_SCRIPT_NAME
|
||||
# application specific stuff is added later
|
||||
chmod +x /usr/bin/$WATCHDOG_SCRIPT_NAME
|
||||
|
||||
if ! grep -q "/usr/bin/$WATCHDOG_SCRIPT_NAME" /etc/crontab; then
|
||||
if ! grep -q "/usr/bin/$WATCHDOG_SCRIPT_NAME" /etc/crontab; then
|
||||
echo "* * * * * root /usr/bin/$WATCHDOG_SCRIPT_NAME" >> /etc/crontab
|
||||
fi
|
||||
fi
|
||||
|
||||
echo 'install_watchdog_script' >> $COMPLETION_FILE
|
||||
echo 'install_watchdog_script' >> $COMPLETION_FILE
|
||||
}
|
||||
|
||||
function install_irc_client {
|
||||
function install_irc_client {
|
||||
if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
|
||||
return
|
||||
fi
|
||||
|
|
@ -7749,9 +7698,9 @@ echo 'install_watchdog_script' >> $COMPLETION_FILE
|
|||
chown -R $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/.irssi
|
||||
|
||||
echo 'install_irc_client' >> $COMPLETION_FILE
|
||||
}
|
||||
}
|
||||
|
||||
function install_irc_server {
|
||||
function install_irc_server {
|
||||
if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
|
||||
return
|
||||
fi
|
||||
|
|
@ -7866,17 +7815,17 @@ echo 'install_watchdog_script' >> $COMPLETION_FILE
|
|||
fi
|
||||
|
||||
echo 'install_irc_server' >> $COMPLETION_FILE
|
||||
}
|
||||
}
|
||||
|
||||
function get_wiki_admin_password {
|
||||
function get_wiki_admin_password {
|
||||
if [ -f /home/$MY_USERNAME/README ]; then
|
||||
if grep -q "Wiki password" /home/$MY_USERNAME/README; then
|
||||
WIKI_ADMIN_PASSWORD=$(cat /home/$MY_USERNAME/README | grep "Wiki password:" | awk -F ':' '{print $2}' | sed 's/^ *//')
|
||||
fi
|
||||
fi
|
||||
}
|
||||
}
|
||||
|
||||
function install_wiki {
|
||||
function install_wiki {
|
||||
if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MASH" ]]; then
|
||||
return
|
||||
fi
|
||||
|
|
@ -10841,7 +10790,6 @@ install_web_server
|
|||
install_web_server_access_control
|
||||
configure_firewall_for_web_server
|
||||
install_owncloud_official_deb
|
||||
install_owncloud_repo_music_app
|
||||
upgrade_golang
|
||||
install_gogs
|
||||
install_xmpp
|
||||
|
|
|
|||
Loading…
Reference in New Issue