diff options
| -rw-r--r-- | etc/cron.d/mirror.cron | 6 | ||||
| -rw-r--r-- | usr/share/doc/mirror/README.txt | 3 | ||||
| -rw-r--r-- | usr/share/doc/mirror/version.txt | 2 | ||||
| -rwxr-xr-x | usr/share/mirror/build/localize_git.sh | 2 | ||||
| -rw-r--r-- | usr/share/mirror/build/mirror.spec | 5 | ||||
| -rw-r--r-- | usr/share/mirror/build/scrub.txt | 2 | ||||
| -rw-r--r-- | usr/share/mirror/inc/rsync | 2 |
7 files changed, 15 insertions, 7 deletions
diff --git a/etc/cron.d/mirror.cron b/etc/cron.d/mirror.cron index 52563b8..67260a3 100644 --- a/etc/cron.d/mirror.cron +++ b/etc/cron.d/mirror.cron @@ -1,4 +1,6 @@ # File: /etc/cron.d/mirror.cron # Package: mirror -# Purpose: Run mirror right after work hours each day -05 17 * * * root /usr/share/mirror/mirror-master.sh +# Purpose: Run mirror during work hours but overnight on weekends. +00 8 * * 1-5 root /usr/share/mirror/mirror-master.sh 1>/dev/null 2>&1 +00 1 * * 0,6 root /usr/share/mirror/mirror-master.sh 1>/dev/null 2>&1 + diff --git a/usr/share/doc/mirror/README.txt b/usr/share/doc/mirror/README.txt index 41bbf2f..396a1ec 100644 --- a/usr/share/doc/mirror/README.txt +++ b/usr/share/doc/mirror/README.txt @@ -138,3 +138,6 @@ Changed deploy.conf to use package directories for deployment - Fixed deb repo html guide to have correct pathname for /etc/apt/sources.list.d/. - Fixed update-{deb,rpm,tar} scripts to match syntax, and chown files. - Fixed deploy.sh: allow packages to be saved to a symlinked directory. + +* Sat Dec 9 2017 B Stack <bgstack15@gmail.com> 1.1-6 +- Work in progress diff --git a/usr/share/doc/mirror/version.txt b/usr/share/doc/mirror/version.txt index c183539..d4e5218 100644 --- a/usr/share/doc/mirror/version.txt +++ b/usr/share/doc/mirror/version.txt @@ -1 +1 @@ -1.1-5 +1.1-6 diff --git a/usr/share/mirror/build/localize_git.sh b/usr/share/mirror/build/localize_git.sh index dd582c8..cf7b010 100755 --- a/usr/share/mirror/build/localize_git.sh +++ b/usr/share/mirror/build/localize_git.sh @@ -1,2 +1,2 @@ #!/bin/sh -\cp -pRf /home/work/mirror.clean/.git /home/bgirton-local/rpmbuild/SOURCES/mirror-1.1-5/ +\cp -pRf /home/work/mirror.clean/.git /home/bgirton-local/rpmbuild/SOURCES/mirror-1.1-6/ diff --git a/usr/share/mirror/build/mirror.spec b/usr/share/mirror/build/mirror.spec index 077518c..69bb773 100644 --- a/usr/share/mirror/build/mirror.spec +++ b/usr/share/mirror/build/mirror.spec @@ -1,7 +1,7 @@ Summary: Mirror Name: mirror Version: 1.1 -Release: 5 +Release: 6 License: CC BY-SA 4.0 Group: Applications/System Source: mirror.tgz @@ -97,6 +97,9 @@ rm -rf ${buildroot} /usr/share/httpd/icons/repo.png %changelog +* Sat Dec 9 2017 B Stack <bgstack15@gmail.com> 1.1-6 +- Updated content. See doc/README.txt. + * Sat Jul 22 2017 B Stack <bgstack15@gmail.com> 1.1-5 - Rearranged directory structure to match current bgscripts standard. - Updated content. See doc/README.txt. diff --git a/usr/share/mirror/build/scrub.txt b/usr/share/mirror/build/scrub.txt index dbf567a..973151a 100644 --- a/usr/share/mirror/build/scrub.txt +++ b/usr/share/mirror/build/scrub.txt @@ -1,5 +1,5 @@ # for scrubpy version 2016-11-16a or newer -source /home/bgirton-local/rpmbuild/SOURCES/mirror-1.1-5 +source /home/bgirton/rpmbuild/SOURCES/mirror-1.1-6 target /home/work/mirror.clean ignore "tgz png gif jpg pyc pyo git swp ico" # rest of the lines are "OLD WORD" "NEW WORD" diff --git a/usr/share/mirror/inc/rsync b/usr/share/mirror/inc/rsync index 47fe881..2435036 100644 --- a/usr/share/mirror/inc/rsync +++ b/usr/share/mirror/inc/rsync @@ -5,7 +5,7 @@ #RSYNCOPTIONS="--delete-during -l -p -r -t -v" RSYNCOPTIONS="-rlptv --del" -MIRRORDIR='/mnt/mirror' +MIRRORDIR='/mnt/narcissus/mirror' function rmirror { if [ -z "$2" ] ; then |