From b31b0aafdff9cf8fc430c1f89e4eb55867463c48 Mon Sep 17 00:00:00 2001 From: Morgan Jeon Date: Thu, 12 Oct 2023 13:04:07 +0900 Subject: [PATCH] merge --- index.html | 158 ------------------------------------ scripts/config.yml | 32 ++------ scripts/sync.sh | 4 +- {pub => static}/favicon.ico | Bin {pub => static}/form.html | 0 {pub => static}/index.html | 0 {pub => static}/log.html | 0 {pub => static}/robots.txt | 0 8 files changed, 7 insertions(+), 187 deletions(-) delete mode 100644 index.html rename {pub => static}/favicon.ico (100%) rename {pub => static}/form.html (100%) rename {pub => static}/index.html (100%) rename {pub => static}/log.html (100%) rename {pub => static}/robots.txt (100%) diff --git a/index.html b/index.html deleted file mode 100644 index 47802c7..0000000 --- a/index.html +++ /dev/null @@ -1,158 +0,0 @@ - - - - - - PAWE.ME - - - - - - - - -
-

PAWE.ME

-

Simple mirroring & archiving server.

- -
-
-
-

Mirroring List

-
-
-

ArchLinux (x86_64)

-

Last Updated: 2023-10-12 11:24

-

Upstream: rsync://mirrors.xtom.de/archlinux/

-
-
-

Ubuntu

-

Last Updated: 2023-10-12 11:24

-

Upstream: rsync://rsync.archive.ubuntu.com/ubuntu/

-
-
-

Ubuntu Releases

-

Last Updated: Not Synced

-

Upstream: rsync://releases.ubuntu.com/releases/

-
-
-

Debian

-

Last Updated: Not Synced

-

Upstream: rsync://mirrors.xtom.jp/debian/

-
-
-

Debian CD

-

Last Updated: Not Synced

-

Upstream: rsync://ftp.lanet.kr/debian-cd/

-
-
-

Fedora

-

Last Updated: Not Synced

-

Upstream: rsync://dl.fedoraproject.org/fedora-enchilada/linux/

-
-
-

Manjaro

-

Last Updated: Not Synced

-

Upstream: rsync://ftp.riken.jp/manjaro/

-
-
-

Raspbian

-

Last Updated: Not Synced

-

Upstream: rsync://archive.raspbian.org/archive/

-
-
-
-
-

Additional Mirror

- -
-
-

ArchLinux (ARM)

-

Last Updated: Not Synced

-

Upstream: http://jp.mirror.archlinuxarm.org/

-
-
-

AsahiLinux

-

Last Updated: Not Synced

-

Upstream: https://cdn.asahilinux.org/

-
-
-

Ubuntu Releases (Old)

-

Last Updated: Not Synced

-

Upstream: rsync://old-releases.ubuntu.com/releases/

-
- -
-

Image Files

-
- -
-
-
-

Server Info

-
    -
  • Xeon CPU
    • -
  • 64GiB Memory
    • -
  • 1Gbps Network, Seoul, Korea
    • -
  • 32TB Storage
    • -
-

Fill out this form to request additional mirroring.

-
- -
- - - - - \ No newline at end of file diff --git a/scripts/config.yml b/scripts/config.yml index 9298e88..f7d9b63 100644 --- a/scripts/config.yml +++ b/scripts/config.yml @@ -47,21 +47,13 @@ repos: UBUNTU_CD: url: rsync://releases.ubuntu.com/releases/ -<<<<<<< HEAD - duration: 12 -======= - delay: 24 ->>>>>>> refs/remotes/origin/main + delay: 12 name: "Ubuntu Releases" path: ubuntu_cd UBUNTU_CD_OLD: url: rsync://old-releases.ubuntu.com/releases/ -<<<<<<< HEAD - duration: 12 -======= - delay: 24 ->>>>>>> refs/remotes/origin/main + delay: 12 name: "Ubuntu Releases (Old)" path: ubuntu_cd_old @@ -77,11 +69,7 @@ repos: DEBIAN_CD: url: rsync://ftp.lanet.kr/debian-cd/ -<<<<<<< HEAD - duration: 12 -======= - delay: 24 ->>>>>>> refs/remotes/origin/main + delay: 12 name: "Debian CD" path: debian_cd @@ -108,25 +96,15 @@ repos: path: archlinuxarm url: http://jp.mirror.archlinuxarm.org/ type: http -<<<<<<< HEAD - duration: 12 - -======= delay: 12 - last_sync: "2023-10-09T23:30Z" ->>>>>>> refs/remotes/origin/main + ASAHILINUX: name: "AsahiLinux" path: asahilinux url: https://cdn.asahilinux.org/ type: http -<<<<<<< HEAD - duration: 12 - -======= delay: 12 - last_sync: "2023-10-09T23:30Z" ->>>>>>> refs/remotes/origin/main + index: - ARCHLINUX - UBUNTU UBUNTU_CD diff --git a/scripts/sync.sh b/scripts/sync.sh index 2ab227c..c9f28da 100755 --- a/scripts/sync.sh +++ b/scripts/sync.sh @@ -236,9 +236,9 @@ for repo in "${repos[@]}"; do cd $BASE_DIR debug "Checking $repo..." - duration=$(get_repo_config ${repo} "duration") + delay=$(get_repo_config ${repo} "delay") last_sync_timestamp=$(date -d "$(get_repo_config ${repo} "last_sync")" +%s) - next_sync_timestamp=$(( last_sync_timestamp + duration * 3600 )) + next_sync_timestamp=$(( last_sync_timestamp + delay * 3600 )) if [[ -v DEBUG ]]; then next_sync_timestamp=1 diff --git a/pub/favicon.ico b/static/favicon.ico similarity index 100% rename from pub/favicon.ico rename to static/favicon.ico diff --git a/pub/form.html b/static/form.html similarity index 100% rename from pub/form.html rename to static/form.html diff --git a/pub/index.html b/static/index.html similarity index 100% rename from pub/index.html rename to static/index.html diff --git a/pub/log.html b/static/log.html similarity index 100% rename from pub/log.html rename to static/log.html diff --git a/pub/robots.txt b/static/robots.txt similarity index 100% rename from pub/robots.txt rename to static/robots.txt