Apple-2-SW
/
a2server
mirror of https://github.com/RasppleII/a2server.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move 1-storage fixup code to fixup 

1-storage included a block that moved /media/A2SHARED (which was a nono
for us to use under FHS) to /srv/A2SERVER.  This has now been moved to
fixup.
This commit is contained in:
T. Joseph Carter 2018-09-08 18:49:52 -07:00
parent d71b2a4048
commit f1b141bd9c
2 changed files with 42 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/a2server-1-storage.txt
View File

@ -2,20 +2,6 @@
# vim: set tabstop=4 shiftwidth=4 noexpandtab filetype=sh:
# --- Setting up the share volume
# 1.3.0: move /media/A2SHARED (pre-1.3.0) to /srv/A2SERVER
if [[ -d /media/A2SHARED ]]; then
echo "A2SERVER: Moving /media/A2SHARED to /srv/A2SERVER..."
sudo /etc/init.d/netatalk stop &> /dev/null
sudo /etc/init.d/samba stop &> /dev/null
[[ ! -d /srv ]] && sudo mkdir -p /srv
sudo mv /media/A2SHARED /srv/A2SERVER
sudo sed -i 's|/media/A2SHARED|/srv/A2SERVER|g' /usr/local/etc/netatalk/AppleVolumes.default
if [[ -f /etc/samba/smbd.conf ]]; then
sudo sed -i 's|/media/A2SHARED|/srv/A2SERVER|g' /etc/samba/smbd.conf
fi
fi
if [[ ! -d /srv/A2SERVER ]]; then
echo "A2SERVER: Preparing the shared files volume..."
mygroup="$(id -ng)"

42
scripts/fixup
View File

@ -25,3 +25,45 @@
# :
# }
# fix_some_stupid_mistake
# Added 2018-09-07
move_media_a2shared()
{
# # Needed until: Upgrades from versions < 1.3.0 are not supported
local netatalk_restart
if [[ -d /media/A2SHARED ]]; then
cat <<-EOF
a2server: As of version 1.3.0, the standard location for
netatalk to store Apple II files is /srv/A2SERVER.
We will move /media/A2SHARED to the new location.
If you need to do that yourself (you'll know if
you do), press ctrl-c now. Otherwise press Return.
EOF
read
# netatalk doesn't much like its sharepoint just disappearing
if service netatalk status >/dev/null; then
netatalk_restart=1
sudo service netatalk stop
fi
# Debated: Create /media/A2SHARED symlink? Nah, bad idea.
sudo mv /media/A2SHARED /srv/A2SERVER
sudo sed -i 's|/media/A2SHARED|/srv/A2SERVER|g' /usr/local/etc/netatalk/AppleVolumes.default
if [[ $netatalk_restart ]]; then
sudo service netatalk start
fi
# Samba can just be reloaded after modifying the config
if [[ -f /etc/samba/smbd.conf ]]; then
sudo sed -i 's|/media/A2SHARED|/srv/A2SERVER|g' /etc/samba/smbd.conf
if service smbd status >/dev/null; then
sudo service smbd reload
elif service samba status >/dev/null; then
sudo service samba reload
fi
fi
fi
}
move_media_a2shared