diff options
author | B Stack <bgstack15@gmail.com> | 2016-11-11 15:26:33 -0500 |
---|---|---|
committer | B Stack <bgstack15@gmail.com> | 2016-11-11 15:26:33 -0500 |
commit | 66066e4f3d5a3b38aad37c0113988bf9c249b361 (patch) | |
tree | 3193ecefa2db14473f0efa0582d018b26a69529f | |
parent | Initial commit (diff) | |
download | mirror-66066e4f3d5a3b38aad37c0113988bf9c249b361.tar.gz mirror-66066e4f3d5a3b38aad37c0113988bf9c249b361.tar.bz2 mirror-66066e4f3d5a3b38aad37c0113988bf9c249b361.zip |
Added favicon, now version mirror-1.0-5
-rw-r--r-- | etc/mirror/README.txt | 31 | ||||
-rw-r--r-- | etc/mirror/docs/mirror.spec | 5 | ||||
-rw-r--r-- | etc/mirror/examples/FOOTER.html | 5 | ||||
-rw-r--r-- | etc/mirror/examples/HEADER.html | 5 | ||||
-rw-r--r-- | etc/mirror/examples/favicon.ico | bin | 0 -> 4286 bytes | |||
-rw-r--r-- | etc/mirror/examples/favicon.png | bin | 0 -> 575 bytes | |||
-rwxr-xr-x | etc/mirror/inc/deploy.sh | 2 | ||||
-rwxr-xr-x | etc/mirror/inc/localize_git.sh | 2 | ||||
-rwxr-xr-x | etc/mirror/inc/scrub.py | 4 | ||||
-rw-r--r-- | etc/mirror/inc/scrub.txt | 3 | ||||
-rwxr-xr-x | etc/mirror/mirror-master.sh | 2 | ||||
-rw-r--r-- | etc/mirror/packaging.txt | 4 |
12 files changed, 39 insertions, 24 deletions
diff --git a/etc/mirror/README.txt b/etc/mirror/README.txt index e56418d..0a5253f 100644 --- a/etc/mirror/README.txt +++ b/etc/mirror/README.txt @@ -1,5 +1,5 @@ File: etc/mirror/README.txt -Package: mirror 1.0-3 +Package: mirror 1.0-5 Author: bgstack15@gmail.com Startdate: 2016-06-08 Title: Readme file for mirror @@ -38,19 +38,6 @@ chmod +x /etc/mirror/scripts/{centos,fedora-epel,fedora-releases,fedora-updates, Included in this package are some apache configs. For a nice intro page, a template is provided at /etc/mirror/inc/HEADER.html -### CHANGELOG -1.0-2 2016-06-10 -uses config file /etc/mirror/mirror.conf - -1.0-3 2016-07-14 -added supplementary script /etc/mirror/inc/deploy.sh -New feature: deploy -See its config file /etc/mirror/inc/deploy.conf - -2016-10-28 mirror 1.0-4 -Adding elemants for safe publishing on github -Added repos for linuxmint - ### USAGE BLOCK usage: mirror-master.sh [-duV] [ -f | --file /etc/mirror/mirror.conf ] [ --scriptsdir /etc/mirror/scripts ] [ scriptname ] version ${mirrormasterversion} @@ -75,3 +62,19 @@ Examples: This command will run all files with o+x perms in scriptsdir directory. ### REFERENCE + +### CHANGELOG +1.0-2 2016-06-10 +uses config file /etc/mirror/mirror.conf + +1.0-3 2016-07-14 +added supplementary script /etc/mirror/inc/deploy.sh +New feature: deploy +See its config file /etc/mirror/inc/deploy.conf + +2016-10-28 mirror 1.0-4 +Adding elemants for safe publishing on github +Added repos for linuxmint + +2016-11-11 mirror 1.0-5 +adding favicon, licensed CC BY 3.0 by Lorc <http://lorcblog.blogspot.com/> diff --git a/etc/mirror/docs/mirror.spec b/etc/mirror/docs/mirror.spec index abcd38c..064dcf8 100644 --- a/etc/mirror/docs/mirror.spec +++ b/etc/mirror/docs/mirror.spec @@ -3,7 +3,7 @@ Summary: Mirror Name: mirror Version: 1.0 -Release: 4 +Release: 5 License: CC BY-SA 4.0 Group: Applications/System Source: mirror.tgz @@ -68,6 +68,8 @@ rm -rf ${buildroot} %doc %attr(444, -, -) /etc/mirror/inc/scrub.txt /etc/mirror/inc/rsync %doc %attr(444, -, -) /etc/mirror/packaging.txt +/etc/mirror/examples/favicon.ico +/etc/mirror/examples/FOOTER.html /etc/mirror/examples/HEADER.html /etc/mirror/examples/example-debian/example-debian.list /etc/mirror/examples/example-debian/update-example-debian.sh @@ -78,6 +80,7 @@ rm -rf ${buildroot} /etc/mirror/examples/example-rpm/HEADER.html /etc/mirror/examples/example-rpm/example-rpm.repo /etc/mirror/examples/example-rpm/update-example-rpm.sh +/etc/mirror/examples/favicon.png %config /etc/mirror/mirror.conf %config /etc/httpd/sites/10.1.8.63.conf %config /etc/httpd/sites/mntscripts.conf diff --git a/etc/mirror/examples/FOOTER.html b/etc/mirror/examples/FOOTER.html new file mode 100644 index 0000000..517920b --- /dev/null +++ b/etc/mirror/examples/FOOTER.html @@ -0,0 +1,5 @@ +<body> +<img src="favicon.ico"> +Favicon licensed CC BY 3.0 by <a href="http://lorcblog.blogspot.com/">Lorc</a>. Available on <a href="http://game-icons.net/">http://game-icons.net/</a> +</body> +</html> diff --git a/etc/mirror/examples/HEADER.html b/etc/mirror/examples/HEADER.html index d44fa8c..1130cfc 100644 --- a/etc/mirror/examples/HEADER.html +++ b/etc/mirror/examples/HEADER.html @@ -2,7 +2,10 @@ "http://www.w3.org/TR/REC-html40/loose.dtd"> <html> -<head><title>Welcome to mirror.example.com</title></head> +<head> + <title>Welcome to mirror.example.com</title> + <link rel='icon' href='favicon.ico'/> +</head> <body> <center><h1>Welcome to mirror.example.com</h1> diff --git a/etc/mirror/examples/favicon.ico b/etc/mirror/examples/favicon.ico Binary files differnew file mode 100644 index 0000000..28e780c --- /dev/null +++ b/etc/mirror/examples/favicon.ico diff --git a/etc/mirror/examples/favicon.png b/etc/mirror/examples/favicon.png Binary files differnew file mode 100644 index 0000000..fce9365 --- /dev/null +++ b/etc/mirror/examples/favicon.png diff --git a/etc/mirror/inc/deploy.sh b/etc/mirror/inc/deploy.sh index ac1cb32..b5668e0 100755 --- a/etc/mirror/inc/deploy.sh +++ b/etc/mirror/inc/deploy.sh @@ -4,7 +4,7 @@ # Startdate: 2016-07-14 09:53:09 # Title: Script that Deploys a Package # Purpose: To make it easy to deploy to the mirror a new version of a package -# Package: mirror-1.0-3 +# Package: mirror # History: # Usage: # Reference: ftemplate.sh 2016-07-12a; framework.sh 2016-05-25a diff --git a/etc/mirror/inc/localize_git.sh b/etc/mirror/inc/localize_git.sh index 7423276..35b7ce6 100755 --- a/etc/mirror/inc/localize_git.sh +++ b/etc/mirror/inc/localize_git.sh @@ -1,2 +1,2 @@ #!/bin/sh -\cp -pRf /home/work/mirror/.git /home/bgstack15/rpmbuild/SOURCES/mirror-1.0-4/ +\cp -pRf /home/work/mirror.clean/.git /home/bgstack15/rpmbuild/SOURCES/mirror-1.0-5/ diff --git a/etc/mirror/inc/scrub.py b/etc/mirror/inc/scrub.py index 52652fd..01ddbb0 100755 --- a/etc/mirror/inc/scrub.py +++ b/etc/mirror/inc/scrub.py @@ -36,7 +36,7 @@ import re, shlex, os, sys, shutil from pathlib import Path # scrubpy version -scrubpyversion = "2016-10-31a" +scrubpyversion = "2016-11-11a" # Define functions @@ -55,7 +55,7 @@ def removeComments(string): def isValidFile(_thisstring): # return true if not png, tgz, or other non-text file _isValidFile=True - if re.compile('.*\.(tgz|png|gif|jpg|pyc|pyo|git|swp)').match(_thisstring): + if re.compile('.*\.(tgz|png|gif|jpg|pyc|pyo|git|swp|ico)').match(_thisstring): _isValidFile=False #print( _thisstring + ": " + str(_isValidFile) ) return _isValidFile diff --git a/etc/mirror/inc/scrub.txt b/etc/mirror/inc/scrub.txt index 7d93f9a..153263f 100644 --- a/etc/mirror/inc/scrub.txt +++ b/etc/mirror/inc/scrub.txt @@ -1,5 +1,5 @@ # First line: source directory Second line: target directory. WILL BE OVERWRITTEN! -/home/bgstack15/rpmbuild/SOURCES/mirror-1.0-4/ +/home/bgstack15/rpmbuild/SOURCES/mirror-1.0-5/ /home/work/mirror.clean # rest of the lines are "OLD WORD" "NEW WORD" BGSTACK15 BGSTACK15 @@ -7,6 +7,7 @@ Bgstack15 Bgstack15 bgstack15 bgstack15 Alice Alice User1 User1 +auser1 auser1 example example EXAMPLE EXAMPLE ".com" ".com" diff --git a/etc/mirror/mirror-master.sh b/etc/mirror/mirror-master.sh index fbd2ab8..351574f 100755 --- a/etc/mirror/mirror-master.sh +++ b/etc/mirror/mirror-master.sh @@ -11,7 +11,7 @@ # 2016-06-08 Modified to use mirror.conf config file, for mirror-1.0-2 # Usage: Call in cron every day # Reference: ftemplate.sh 2015-11-23a; framework.sh 2015-11-23a -# mirror.lcroce (2014-11-11) +# mirror.auser1 (2014-11-11) # Improve: fiversion="2015-11-23a" mirrormasterversion="2016-06-08a" diff --git a/etc/mirror/packaging.txt b/etc/mirror/packaging.txt index 18349a7..a97d4c5 100644 --- a/etc/mirror/packaging.txt +++ b/etc/mirror/packaging.txt @@ -12,7 +12,7 @@ Document: Below this line ### PACKAGING for rhel/centos rpmbuilddir=~/rpmbuild/ package=mirror -version=1.0-4 +version=1.0-5 shortversion=1.0 packagespecfile="${package}-${version}/etc/${package}/docs/${package}.spec" sed -i -n '1,/^\%files$/p;' ${rpmbuilddir}/SOURCES/"${packagespecfile}" @@ -30,6 +30,6 @@ rpmbuild -bb "${rpmbuilddir}"/SPECS/"${package}".spec ### PACKAGING in a master.tgz cd ~/deb 2>/dev/null || cd ~/rpmbuild/SOURCES package=mirror -version=1.0-4 +version=1.0-5 rm -rf ./"${package}-${version}".master.tgz tar -zcf "${package}-${version}".master.tgz "${package}-${version}"/ |