diff options
| -rw-r--r-- | etc/mirror/mirror.conf | 2 | ||||
| -rw-r--r-- | usr/share/mirror/docs/README.txt | 7 | ||||
| -rw-r--r-- | usr/share/mirror/docs/mirror.spec | 36 | ||||
| -rw-r--r-- | usr/share/mirror/examples/sites/10.1.8.63.conf (renamed from etc/httpd/sites/10.1.8.63.conf) | 0 | ||||
| -rw-r--r-- | usr/share/mirror/examples/sites/mirror.conf (renamed from etc/httpd/sites/mirror.conf) | 0 | ||||
| -rw-r--r-- | usr/share/mirror/examples/sites/mntscripts.conf (renamed from etc/httpd/sites/mntscripts.conf) | 0 | ||||
| -rw-r--r-- | usr/share/mirror/examples/sites/zz_proxy.conf (renamed from etc/httpd/sites/zz_proxy.conf) | 0 | ||||
| -rwxr-xr-x | usr/share/mirror/inc/localize_git.sh | 2 | ||||
| -rwxr-xr-x | usr/share/mirror/inc/pack | 4 | ||||
| -rw-r--r-- | usr/share/mirror/inc/scrub.txt | 2 |
10 files changed, 29 insertions, 24 deletions
diff --git a/etc/mirror/mirror.conf b/etc/mirror/mirror.conf index 69f38c7..03f9b8e 100644 --- a/etc/mirror/mirror.conf +++ b/etc/mirror/mirror.conf @@ -8,6 +8,6 @@ lockfile /var/lock/mirror.lock logdir /var/log/mirror logfile ${logdir}/mirror.${today}.log errorfile ${logdir}/mirror.${today}.err -scriptsdir /etc/mirror/scripts +scriptsdir /usr/share/mirror/scripts keeplogs 14 #mirrordir is actually manually configured for each executable script. See $mirrorscriptsdir diff --git a/usr/share/mirror/docs/README.txt b/usr/share/mirror/docs/README.txt index cb768fe..ef5ddbf 100644 --- a/usr/share/mirror/docs/README.txt +++ b/usr/share/mirror/docs/README.txt @@ -1,5 +1,5 @@ File: etc/mirror/README.txt -Package: mirror 1.0-7 +Package: mirror 1.0-8 Author: bgstack15@gmail.com Startdate: 2016-06-08 Title: Readme file for mirror @@ -90,3 +90,8 @@ Updated all scripts for the bgscripts-1.1-28 directory migration to /usr/share/b Rearranged directory structure to comply with FHS 3.0 Included a zz_proxy.conf example Added deploy.sh --noupdate option + +2017-02-07 mirror-1.0-8 +Fixed mirror.conf to point to correct directory of /usr/share/mirror/scripts +Added contents of /usr/share/mirror/scripts as %config directives in ./pack spec instructions +Moved httpd/sites contents to /usr/share/mirror/examples/sites so it will not overwrite any existing files. These are just examples and should be deployed manually. diff --git a/usr/share/mirror/docs/mirror.spec b/usr/share/mirror/docs/mirror.spec index 69c3163..66cb578 100644 --- a/usr/share/mirror/docs/mirror.spec +++ b/usr/share/mirror/docs/mirror.spec @@ -1,7 +1,7 @@ Summary: Mirror Name: mirror Version: 1.0 -Release: 7 +Release: 8 License: CC BY-SA 4.0 Group: Applications/System Source: mirror.tgz @@ -38,26 +38,22 @@ rm -rf ${buildroot} %config /etc/cron.d/mirror.cron %config /etc/mirror/deploy.conf %config /etc/mirror/mirror.conf -%config /etc/httpd/sites/zz_proxy.conf -%config /etc/httpd/sites/10.1.8.63.conf -%config /etc/httpd/sites/mntscripts.conf -%config /etc/httpd/sites/mirror.conf %config /etc/httpd/conf.d/local_mirror.conf %verify(link) /usr/local/bin/deploy /usr/share/mirror/mirror-master.sh -/usr/share/mirror/scripts/ssh -/usr/share/mirror/scripts/libreoffice -/usr/share/mirror/scripts/linuxmint-repos -/usr/share/mirror/scripts/ubuntu -/usr/share/mirror/scripts/putty -/usr/share/mirror/scripts/rsyslog -/usr/share/mirror/scripts/centos -/usr/share/mirror/scripts/fedora-epel -/usr/share/mirror/scripts/old-scripts.tgz -/usr/share/mirror/scripts/ubuntu-releases -/usr/share/mirror/scripts/linuxmint-isos -/usr/share/mirror/scripts/fedora-releases -/usr/share/mirror/scripts/fedora-updates +%config /usr/share/mirror/scripts/ssh +%config /usr/share/mirror/scripts/libreoffice +%config /usr/share/mirror/scripts/linuxmint-repos +%config /usr/share/mirror/scripts/ubuntu +%config /usr/share/mirror/scripts/putty +%config /usr/share/mirror/scripts/rsyslog +%config /usr/share/mirror/scripts/centos +%config /usr/share/mirror/scripts/fedora-epel +%config /usr/share/mirror/scripts/old-scripts.tgz +%config /usr/share/mirror/scripts/ubuntu-releases +%config /usr/share/mirror/scripts/linuxmint-isos +%config /usr/share/mirror/scripts/fedora-releases +%config /usr/share/mirror/scripts/fedora-updates /usr/share/mirror/docs/debian/postinst /usr/share/mirror/docs/debian/conffiles /usr/share/mirror/docs/debian/prerm @@ -76,6 +72,10 @@ rm -rf ${buildroot} /usr/share/mirror/examples/favicon.ico /usr/share/mirror/examples/FOOTER.html /usr/share/mirror/examples/HEADER.html +%config /usr/share/mirror/examples/sites/zz_proxy.conf +%config /usr/share/mirror/examples/sites/10.1.8.63.conf +%config /usr/share/mirror/examples/sites/mntscripts.conf +%config /usr/share/mirror/examples/sites/mirror.conf /usr/share/mirror/examples/example-debian/example-debian.list /usr/share/mirror/examples/example-debian/update-example-debian.sh /usr/share/mirror/examples/example-debian/FOOTER.html diff --git a/etc/httpd/sites/10.1.8.63.conf b/usr/share/mirror/examples/sites/10.1.8.63.conf index 7afda1b..7afda1b 100644 --- a/etc/httpd/sites/10.1.8.63.conf +++ b/usr/share/mirror/examples/sites/10.1.8.63.conf diff --git a/etc/httpd/sites/mirror.conf b/usr/share/mirror/examples/sites/mirror.conf index 5f2e761..5f2e761 100644 --- a/etc/httpd/sites/mirror.conf +++ b/usr/share/mirror/examples/sites/mirror.conf diff --git a/etc/httpd/sites/mntscripts.conf b/usr/share/mirror/examples/sites/mntscripts.conf index 31cdc6b..31cdc6b 100644 --- a/etc/httpd/sites/mntscripts.conf +++ b/usr/share/mirror/examples/sites/mntscripts.conf diff --git a/etc/httpd/sites/zz_proxy.conf b/usr/share/mirror/examples/sites/zz_proxy.conf index c6221de..c6221de 100644 --- a/etc/httpd/sites/zz_proxy.conf +++ b/usr/share/mirror/examples/sites/zz_proxy.conf diff --git a/usr/share/mirror/inc/localize_git.sh b/usr/share/mirror/inc/localize_git.sh index e386977..6ac5525 100755 --- a/usr/share/mirror/inc/localize_git.sh +++ b/usr/share/mirror/inc/localize_git.sh @@ -1,2 +1,2 @@ #!/bin/sh -\cp -pRf /home/work/mirror.clean/.git /home/bgstack15/rpmbuild/SOURCES/mirror-1.0-7/ +\cp -pRf /home/work/mirror.clean/.git /home/bgstack15/rpmbuild/SOURCES/mirror-1.0-8/ diff --git a/usr/share/mirror/inc/pack b/usr/share/mirror/inc/pack index 0fe61de..fb17d85 100755 --- a/usr/share/mirror/inc/pack +++ b/usr/share/mirror/inc/pack @@ -19,7 +19,7 @@ esac echo " $@ " | grep -qiE -- "help|usage|\s-h\s|\s-\?" 1>/dev/null 2>&1 && { # display help and exit less -F <<EOF -pack utility version 2017-02-06a-mirror +pack utility version 2017-02-07a-mirror usage: pack [ rpm | deb | tar | scrub ] [ --debug | -d {0-10} ] Provides a single command for building a package. This script is customized to each package. optional arguments: @@ -54,7 +54,7 @@ rpmbuilddir=~/rpmbuild/ packagespecfile="${package}-${version}/usr/share/${package}/docs/${package}.spec" sed -i -n '1,/^\%files$/p;' "${rpmbuilddir}/SOURCES/${packagespecfile}" cd "${rpmbuilddir}/SOURCES/${package}-${version}" -find * ! -type d ! -regex '.*?.swp' ! -regex '.*?DEBIAN.*?' | sed -e 's/^/\//;' -e 's/\(.*\.txt\)/%doc %attr(444, -, -) \1/;' -e 's/\(.*\.\(conf\|cron\)\|.*sudoers\.d\)/%config \1/;' -e 's/\(.*bin.*\)/%verify(link) \1/;' -e 's/\(.*\)\.py$/\1\.py\n\1\.pyc\n\1\.pyo/;' >> "${rpmbuilddir}/SOURCES/${packagespecfile}" +find * ! -type d ! -regex '.*?.swp' ! -regex '.*?DEBIAN.*?' | sed -e 's/^/\//;' -e 's/\(.*\.txt\)/%doc %attr(444, -, -) \1/;' -e 's/\(.*\.\(conf\|cron\)\|.*sudoers\.d\|\/usr\/share\/mirror\/scripts\/.\+\)/%config \1/;' -e 's/\(.*bin.*\)/%verify(link) \1/;' -e 's/\(.*\)\.py$/\1\.py\n\1\.pyc\n\1\.pyo/;' >> "${rpmbuilddir}/SOURCES/${packagespecfile}" rm -rf "${rpmbuilddir}/SOURCES/${package}-${shortversion}" cp -prf "${rpmbuilddir}/SOURCES/${package}-${version}" "${rpmbuilddir}/SOURCES/${package}-${shortversion}" rm -rf "${rpmbuilddir}/SOURCES/${package}-${shortversion}/DEBIAN" diff --git a/usr/share/mirror/inc/scrub.txt b/usr/share/mirror/inc/scrub.txt index f7d5b53..caee809 100644 --- a/usr/share/mirror/inc/scrub.txt +++ b/usr/share/mirror/inc/scrub.txt @@ -1,5 +1,5 @@ # for scrubpy version 2016-11-16a or newer -source /home/bgstack15/rpmbuild/SOURCES/mirror-1.0-7 +source /home/bgstack15/rpmbuild/SOURCES/mirror-1.0-8 target /home/work/mirror.clean ignore "tgz png gif jpg pyc pyo git swp ico" # rest of the lines are "OLD WORD" "NEW WORD" |