reset to 648d7822b

revert several WIP commits, published accidentally

4 files changed, 0 insertions, 191 deletions

diff --git a/pcr/mirror-sync/PKGBUILD b/pcr/mirror-sync/PKGBUILD
deleted file mode 100644
index d0aa219a2..000000000
--- a/pcr/mirror-sync/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: nobody@nowhere.man
-
-pkgname=repo-sync
-pkgver=0.0.1
-pkgrel=1
-pkgdesc="arch-like package repository synchronization timer (systemd)"
-arch=(any)
-url=https://nowhere.man
-license=(GPL)
-
-depends=(rsync)
-source=(repo-sync.timer
-        repo-sync.sh)
-
-sha256sums=(0
-            0)
-
-
-package()
-{
-  cd "${srcdir}"
-
-  install -Dm644 repo-sync.timer "${pkgdir}"/usr/lib/systemd/repo-sync.timer
-  install -Dm644 repo-sync.sh    "${pkgdir}"/usr/lib/${pkgname}/repo-sync.sh
-}
diff --git a/pcr/mirror-sync/mirror-sync.service b/pcr/mirror-sync/mirror-sync.service
deleted file mode 100644
index 958a2848d..000000000
--- a/pcr/mirror-sync/mirror-sync.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=mirror sync
-ConditionPathIsReadWrite=/srv/repo/
-ConditionPathIsReadWrite=/srv/repo-staging/
-After=network-online.target
-Wants=network-online.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/lib/mirror-sync/mirror-sync.sh
-Nice=19
-StandardOutput=journal
-StandardError=journal
-PrivateTmp=yes
-PrivateDevices=yes
-CapabilityBoundingSet=
-NoNewPrivileges=yes
diff --git a/pcr/mirror-sync/mirror-sync.sh b/pcr/mirror-sync/mirror-sync.sh
deleted file mode 100644
index 773d7a538..000000000
--- a/pcr/mirror-sync/mirror-sync.sh
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/usr/bin/env bash
-
-# TODO: this is a WIP, to replace repo-sync.sh
-
-# This file is derrived from 'syncrepo-template.sh',
-# originally fetched from: https://gitlab.archlinux.org/archlinux/infrastructure/-/raw/master/roles/syncrepo/files/syncrepo-template.sh
-
-########
-#
-# Copyright © 2014-2019 Florian Pritz <bluewind@xinu.at>
-# Copyright © 2021-2022 bill-auger    <bill-auger@programmer.net> (Parabola)
-# For a complete list of contributors, see:
-#   https://gitlab.archlinux.org/archlinux/infrastructure/-/graphs/master
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
-#
-########
-
-# This is a simple mirroring script. To save bandwidth it first checks a
-# timestamp via HTTP and only runs rsync when the timestamp differs from the
-# local copy. As of 2016, a single rsync run without changes transfers roughly
-# 6MiB of data which adds up to roughly 250GiB of traffic per month when rsync
-# is run every minute. Performing a simple check via HTTP first can thus save a
-# lot of traffic.
-#
-# Preparation:
-#
-# This script is mostly pre-configured; but some initial manual steps are required.
-#
-# * $UPSTREAM_HOST must be defined explicitly.
-#
-# * $LOCAL_DIR and $TEMP_DIR must be writable by the user executing this script.
-#
-# * In order for the $LOCK_FILE to work on systemd systems, you will need to add
-#   a configuration file to /etc/tempfiles.d/ (eg: /etc/tempfiles.d/mirror-sync.conf),
-#   with the following text:
-#     D  /run/lock/<MIRROR_SYNC_LOCK_DIR>  -  <REPO_USER>  <REPO_GROUP>  -  -
-#   where:
-#     * <MIRROR_SYNC_LOCK_DIR> corresponds to the $LOCK_FILE entry
-#       eg: /var/lock/MIRROR_SYNC_LOCK_DIR/mirror-sync.lck
-#     * <REPO_LOGIN> and <REPO_GROUP> are login (or UID) and group (or GID)
-#       of the user executing this script
-
-# Parabola changes:
-# * renamed vars and made constant
-# * refactored into functions
-# * always guard sync with '/lastupdate' file check
-# * added parabola mirror examples
-
-
-### CONFIG BEGIN ###
-
-# Mandatory - Local filesystem path to the repo. Example: /srv/repo
-readonly LOCAL_DIR=/srv/repo
-
-# Mandatory - Local filesystem path to the staging directory. Example: /srv/repo-staging
-# This should be on the same filesystem as, but not a subdirectory of $LOCAL_DIR.
-readonly TEMP_DIR=/srv/repo-staging
-
-# Mandatory - Lock file
-readonly LOCK_FILE=/var/lock/mirror-sync/mirror-sync.lck
-
-# Mandatory - Maximum incoming bandwidth limit.
-# Use 0 to disable the limit.
-# The default unit is KiB (see `man rsync` --bwlimit for the valid syntax)
-readonly BW_LIMIT=0
-
-# Mandatory - Source URL of the mirror from which you want to sync.
-# eg: Parabola tier-1 mirrors:
-#     'rsync.cyberbits.eu'       # Roubaix, France      # IPv4
-#     'mirror.grapentin.org'     # Falkenstein, Germany # IPv4 IPv6
-#     'parabola.ip-connect.info' # Vinnytsia, Ukraine   # IPv4 IPv6
-readonly UPSTREAM_HOST=
-
-# Optional - Non-standard port number (eg: ':2222')
-# Normally, this will be empty
-readonly UPSTREAM_PORT=
-
-# Optional - Upstream filesystem path
-# Conventionally, this is empty, or '/parabola'
-readonly UPSTREAM_PATH=/parabola
-
-### CONFIG END ###
-
-
-readonly RSYNC_URL=rsync://${UPSTREAM_HOST}${UPSTREAM_PORT}${UPSTREAM_PATH}
-readonly HTTP_URL=https://${UPSTREAM_HOST}${UPSTREAM_PATH}
-readonly VERBOSE_OPTS='--human-readable --verbose --progress'
-readonly QUIET_OPTS='--quiet'
-readonly HAS_TTY=$( /usr/bin/tty -s && echo 1 || echo 0 )
-readonly VERBOSITY="$( (( HAS_TTY )) && echo "${VERBOSE_OPTS}" || echo "${QUIET_OPTS}" )"
-
-
-rsync_cmd()
-{
-  /usr/bin/rsync --recursive --perms --times --links --hard-links --safe-links \
-                 --temp-dir="${TEMP_DIR}" --delete-after --delay-updates       \
-                 --bwlimit="${BW_LIMIT}" --timeout=600 --contimeout=60         \
-                 --no-motd --exclude='*.links.tar.gz*' ${VERBOSITY} "$@"
-}
-
-init()
-{
-  # Sanity checks and take lock.
-  [[ -n "${UPSTREAM_HOST}" ]]           || return 1
-  mkdir -p "${LOCAL_DIR}" "${TEMP_DIR}" || return 1
-  exec 9> "${LOCK_FILE}"                || return 1
-  /usr/bin/flock -n 9                   || return 1
-
-  # Cleanup any temporary files from old run that might remain.
-  find "${LOCAL_DIR}" -name '.~tmp~' -exec rm -rf {} +
-}
-
-main()
-{
-  init || return 1
-
-  # Syncronize only when there are changes.
-  local local_ts=$(    /usr/bin/cat      "${LOCAL_DIR}"/lastupdate )
-  local upstream_ts=$( /usr/bin/curl -Ls "${HTTP_URL}"/lastupdate  )
-  if [[ "${upstream_ts}" == "${local_ts}" ]]
-  then # Force syncronize 'lastsync' file for statistics.
-       rsync_cmd "$@" "${RSYNC_URL}"/lastsync "${LOCAL_DIR}"/lastsync
-  else rsync_cmd "$@" "${RSYNC_URL}"/         "${LOCAL_DIR}"/
-  fi
-}
-
-
-main "$@"
diff --git a/pcr/mirror-sync/mirror-sync.timer b/pcr/mirror-sync/mirror-sync.timer
deleted file mode 100644
index 8949484e9..000000000
--- a/pcr/mirror-sync/mirror-sync.timer
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=mirror sync timer
-
-[Timer]
-OnUnitInactiveSec=900
-Persistent=yes
-
-[Install]
-WantedBy=timers.target