14 files changed, 17 insertions, 8 deletions
diff --git a/usr/share/mirror/docs/README.txt b/usr/share/mirror/docs/README.txt
index 534583f..fe5bfa4 100644
--- a/usr/share/mirror/docs/README.txt
+++ b/usr/share/mirror/docs/README.txt
@@ -16,10 +16,12 @@ mirror is basically a collection of scripts that provide the sync instructions t
 ## Steps to take before using mirror for the first time
 Configure these files:
 /etc/mirror/mirror.conf
-/etc/httpd/sites/mirror.conf
+/etc/httpd/conf.d/mirror.conf
 /usr/share/mirror/inc/rsync
 
-Select a storage directory. This one is preconfigured for /srv/science/smith122/repo
+Select a storage directory. This one is preconfigured for /mnt/public/www/smith122/repo
+
+Generate a GPG key and modify update-smith122deb.sh to use it.
 
 ## Scripts to run
 The files called by mirror-master are the ones that actually do the source and target selection and file operations. By default they are located in /etc/mirror/scripts/
@@ -63,6 +65,9 @@ Examples:
 ### REFERENCE
 
 ### CREDITS
+Favicon by Lorc (http://lorcblog.blogspot.com/)
+http://game-icons.net/
+License: CC-BY 3.0
 Deb icon by franksouza183 (http://www.iconarchive.com/artist/franksouza183.html)
 http://www.iconarchive.com/show/fs-icons-by-franksouza183/Mimetypes-deb-icon.html
 License: GPL
diff --git a/usr/share/mirror/docs/mirror.spec b/usr/share/mirror/docs/mirror.spec
index a576b87..d2e7015 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.1
-Release: 3
+Release: 4
 License: CC BY-SA 4.0
 Group: Applications/System
 Source: mirror.tgz
diff --git a/usr/share/mirror/examples/HEADER.html b/usr/share/mirror/examples/HEADER.html
index 07bb9e4..e7b395a 100644
--- a/usr/share/mirror/examples/HEADER.html
+++ b/usr/share/mirror/examples/HEADER.html
@@ -9,7 +9,7 @@
 
 <body>
 <center><h1>Welcome to Smith122 repository</h1>
-<!--<h6>migrated to current host 2017-03</h6>-->
+<!--<h6>migrated to current host 2017-05</h6>-->
 </center>
 <hr>
 
diff --git a/usr/share/mirror/examples/exampledeb/FOOTER.html b/usr/share/mirror/examples/deb/FOOTER.html
index 7879e1c..7879e1c 100644
--- a/usr/share/mirror/examples/exampledeb/FOOTER.html
+++ b/usr/share/mirror/examples/deb/FOOTER.html
diff --git a/usr/share/mirror/examples/exampledeb/HEADER.html b/usr/share/mirror/examples/deb/HEADER.html
index 50d8bfa..50d8bfa 100644
--- a/usr/share/mirror/examples/exampledeb/HEADER.html
+++ b/usr/share/mirror/examples/deb/HEADER.html
diff --git a/usr/share/mirror/examples/exampledeb/smith122deb.gpg b/usr/share/mirror/examples/deb/smith122deb.gpg
index d64a765..d64a765 100644
--- a/usr/share/mirror/examples/exampledeb/smith122deb.gpg
+++ b/usr/share/mirror/examples/deb/smith122deb.gpg
diff --git a/usr/share/mirror/examples/exampledeb/smith122deb.list b/usr/share/mirror/examples/deb/smith122deb.list
index feb67e2..feb67e2 100644
--- a/usr/share/mirror/examples/exampledeb/smith122deb.list
+++ b/usr/share/mirror/examples/deb/smith122deb.list
diff --git a/usr/share/mirror/examples/exampledeb/update-smith122deb.sh b/usr/share/mirror/examples/deb/update-smith122deb.sh
index a33d571..b51a203 100755
--- a/usr/share/mirror/examples/exampledeb/update-smith122deb.sh
+++ b/usr/share/mirror/examples/deb/update-smith122deb.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # working directory
-repodir=/srv/science/smith122/repo/deb/
+repodir=/mnt/public/www/smith122/repo/deb/
 cd ${repodir}
 chmod 0644 *deb 1>/dev/null 2>&1
 restorecon -RF "${repodir}"
diff --git a/usr/share/mirror/examples/examplerpm/FOOTER.html b/usr/share/mirror/examples/rpm/FOOTER.html
index 0aeb772..0aeb772 100644
--- a/usr/share/mirror/examples/examplerpm/FOOTER.html
+++ b/usr/share/mirror/examples/rpm/FOOTER.html
diff --git a/usr/share/mirror/examples/examplerpm/HEADER.html b/usr/share/mirror/examples/rpm/HEADER.html
index 274e2ca..274e2ca 100644
--- a/usr/share/mirror/examples/examplerpm/HEADER.html
+++ b/usr/share/mirror/examples/rpm/HEADER.html
diff --git a/usr/share/mirror/examples/examplerpm/smith122rpm.repo b/usr/share/mirror/examples/rpm/smith122rpm.repo
index 48bcc9b..cef7fdf 100644
--- a/usr/share/mirror/examples/examplerpm/smith122rpm.repo
+++ b/usr/share/mirror/examples/rpm/smith122rpm.repo
@@ -5,3 +5,4 @@
 name=smith122rpm
 baseurl=http://albion320.no-ip.biz/smith122/repo/rpm/
 gpgcheck=0
+enabled=1
diff --git a/usr/share/mirror/examples/examplerpm/update-smith122rpm.sh b/usr/share/mirror/examples/rpm/update-smith122rpm.sh
index a6c38a9..eea1d79 100755
--- a/usr/share/mirror/examples/examplerpm/update-smith122rpm.sh
+++ b/usr/share/mirror/examples/rpm/update-smith122rpm.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # working directory
-repodir=/srv/science/smith122/repo/rpm/
+repodir=/mnt/public/www/smith122/repo/rpm/
 cd ${repodir}
 chmod 0644 *rpm 1>/dev/null 2>&1
 restorecon -RF "${repodir}"
diff --git a/usr/share/mirror/inc/localize_git.sh b/usr/share/mirror/inc/localize_git.sh
index 7956f4b..e945f9d 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/bgirton/rpmbuild/SOURCES/mirror-1.1-3/
+\cp -pRf /home/work/mirror.clean/.git /home/bgirton-local/rpmbuild/SOURCES/mirror-1.1-4/
diff --git a/usr/share/mirror/inc/scrub.txt b/usr/share/mirror/inc/scrub.txt
index 587b2f4..a80bb8b 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/bgirton/rpmbuild/SOURCES/mirror-1.1-3
+source /home/bgirton-local/rpmbuild/SOURCES/mirror-1.1-4
 target /home/work/mirror.clean
 ignore "tgz png gif jpg pyc pyo git swp ico"
 # rest of the lines are "OLD WORD" "NEW WORD"
@@ -12,3 +12,6 @@ brian	bname
 GIRTON	STACK15
 Girton	Stack15
 girton	stack15
+STORAGE1	HOST1
+Storage1	Host1
+storage1	host1