From: Till Maas <opensource@till.name>
Date: Fri, 12 Feb 2010 15:26:26 +0000 (+0100)
Subject: smock: Document how to use it without httpd
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=a00c35abbc86c2f603e7988ca192201cb309f81d;p=fedora-mingw.git

smock: Document how to use it without httpd
---

diff --git a/smock/README b/smock/README
index 748c1e0..f1ed67d 100644
--- a/smock/README
+++ b/smock/README
@@ -3,18 +3,21 @@
 by Dan Berrange and Richard W.M. Jones.
 License: GPLv2+
 
-Smock is a thin wrapper around mock to let you build up a whole
-set of dependant RPMs against an external distro.
+Smock is a thin wrapper around mock to let you build up a whole set of
+dependant RPMs against an external distro. Mock needs access to the
+repositories created by smock. This can happen either using httpd or direct
+file access.
 
  - Create directory $HOME/public_html/smock
 
- - Copy smock.httpd.conf to /etc/httpd/conf.d/smock.conf, changing the
+ - Optional: Copy smock.httpd.conf to /etc/httpd/conf.d/smock.conf, changing the
    /home/[USERNAME]/ to your user
 
- - Start or restart httpd
+ - Optional: Start or restart httpd
 
  - Insert smock.mock.extra to all your repos in /etc/mock/ changing the
-   USERNAME and distro name to match
+   USERNAME and distro name to match. If you do not want to use the http
+   server, use the direct file access baseurl instead of the http based one.
 
  - Disable SELinux (/usr/sbin/setenforce Permissive) and you may
    need to do 'chmod 0755 ~' to allow the web server to access your
diff --git a/smock/smock.mock.extra b/smock/smock.mock.extra
index 33d87a2..c308942 100644
--- a/smock/smock.mock.extra
+++ b/smock/smock.mock.extra
@@ -5,5 +5,8 @@
 [smock]
 name=smock
 baseurl=http://127.0.0.1/USERNAME-smock/yum/fedora-9/$basearch
+# If you do not want to use a http server, you need to specify a direct path to the
+# repository. Then comment out the other baseurl line.
+#baseurl=file:///home/USERNAME/public_html/yum/fedora-9/$basearch
 enabled=1
 keepcache=0
diff --git a/smock/smock.pl b/smock/smock.pl
index 2e8a2a4..2ac7955 100755
--- a/smock/smock.pl
+++ b/smock/smock.pl
@@ -75,7 +75,7 @@ must bump the release number or delete the binary RPM from the
 localrepo directory).
 
 B<NOTE:> Please read the README file first.  You need to set up mock
-and a web server before you can use this command.
+and optionally a web server before you can use this command.
 
 =head1 OPTIONS