root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-19 19:40:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

update syncing to new GeoIP

Browse source
This commit is contained in:
Tobias Powalowski 2023-09-15 11:22:50 +02:00
parent 59cd72127f
commit 2d985368e3
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
usr/lib/archboot/bootloader.sh
View file

@ -9,7 +9,7 @@ _SHIM_URL="https://kojipkgs.fedoraproject.org/packages/shim/${_SHIM_VERSION}/${_
_SHIM_RPM="x86_64/shim-x64-${_SHIM_VERSION}-${_SHIM_RELEASE}.x86_64.rpm"
_SHIM32_RPM="x86_64/shim-ia32-${_SHIM_VERSION}-${_SHIM_RELEASE}.x86_64.rpm"
_SHIM_AA64_RPM="aarch64/shim-aa64-${_SHIM_VERSION}-${_SHIM_RELEASE}.aarch64.rpm"
_ARCH_SERVERDIR="/src/bootloader"
_ARCH_SERVERDIR="/${_PUB}/src/bootloader"
_GRUB_ISO="/usr/share/archboot/grub/archboot-iso-grub.cfg"
_prepare_shim_files () {

1
usr/lib/archboot/common.sh
View file

@ -29,6 +29,7 @@ _PACMAN_CONF="/etc/pacman.conf"
_PACMAN_LIB="/var/lib/pacman"
_CACHEDIR="/var/cache/pacman/pkg"
_LOCAL_DB="${_CACHEDIR}/archboot.db"
_PUB="public_html"
_RSYNC="rsync -a -q --delete --delete-delay"
_FIX_PACKAGES="libelf libevent talloc gcc-libs glibc glib2 pcre2 nss terminus-font"
_XORG_PACKAGE="xorg"

22
usr/lib/archboot/server.sh
View file

@ -47,29 +47,29 @@ _update_pacman_chroot() {
#shellcheck disable=SC2086
sudo -u "${_USER}" gpg ${_GPG} "${_PACMAN_CHROOT}" || exit 1
chown "${_USER}:${_GROUP}" "${_PACMAN_CHROOT}"{,.sig} || exit 1
echo "Syncing files to ${_SERVER}:.${_SERVER_PACMAN}..."
echo "Syncing files to ${_SERVER}:${_PUB}/.${_SERVER_PACMAN}..."
#shellcheck disable=SC2086
sudo -u "${_USER}" ${_RSYNC} "${_PACMAN_CHROOT}"{,.sig} "${_SERVER}:.${_SERVER_PACMAN}/" || exit 1
sudo -u "${_USER}" ${_RSYNC} "${_PACMAN_CHROOT}"{,.sig} "${_SERVER}:${_PUB}/.${_SERVER_PACMAN}/" || exit 1
}
_server_upload() {
# copy files to server
echo "Syncing files to ${_SERVER}:.${1}/${_ARCH}..."
echo "Syncing files to ${_SERVER}:${_PUB}/.${1}/${_ARCH}..."
#shellcheck disable=SC2086
sudo -u "${_USER}" ssh "${_SERVER}" [[ -d "./${1}/${_ARCH}" ]] || mkdir -p ".${1}/${_ARCH}"
sudo -u "${_USER}" ssh "${_SERVER}" [[ -d "${_PUB}/.${1}/${_ARCH}" ]] || mkdir -p "${_PUB}/.${1}/${_ARCH}"
#shellcheck disable=SC2086
sudo -u "${_USER}" ${_RSYNC} "${_DIR}" "${_SERVER}":".${1}/${_ARCH}/" || exit 1
sudo -u "${_USER}" ${_RSYNC} "${_DIR}" "${_SERVER}":"${_PUB}/.${1}/${_ARCH}/" || exit 1
# move files on server, create symlink and removing ${_PURGE_DATE} old release
sudo -u "${_USER}" ssh "${_SERVER}" <<EOF
echo "Removing old purge date reached .${1}/${_ARCH}/$(date -d "$(date +) - ${_PURGE_DATE}" +%Y.%m) directory..."
rm -r ".${1}"/"${_ARCH}"/"$(date -d "$(date +) - ${_PURGE_DATE}" +%Y.%m)" 2>"${_NO_LOG}"
cd ".${1}"/"${_ARCH}"
echo "Creating new latest symlink in .${1}/${_ARCH}..."
echo "Removing old purge date reached ${_PUB}/.${1}/${_ARCH}/$(date -d "$(date +) - ${_PURGE_DATE}" +%Y.%m) directory..."
rm -r ${_PUB}/".${1}"/"${_ARCH}"/"$(date -d "$(date +) - ${_PURGE_DATE}" +%Y.%m)" 2>"${_NO_LOG}"
cd ${_PUB}/".${1}"/"${_ARCH}"
echo "Creating new latest symlink in ${_PUB}/.${1}/${_ARCH}..."
rm latest
ln -s "${_DIR}" latest
EOF
# sync to U.S. server
sudo -u "${_USER}" ssh "${_SERVER}" ./sync.sh
# create autoindex HEADER.html
sudo -u "${_USER}" ssh "${_SERVER}" "[[ -e "lsws-autoindex.sh" ]] && ./lsws-autoindex.sh"
}
_create_archive() {