From 306158c31fedd00bf505b5836a6536134735eda4 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jan 27 2016 15:22:24 +0000
Subject: [PATCH 1/4] Update the README


This should provide better instructions on how to get pagure running in a venv
on Fedora

---

diff --git a/README.rst b/README.rst
index d9156fe..0dc4741 100644
--- a/README.rst
+++ b/README.rst
@@ -1,21 +1,22 @@
 Pagure
 ======
 
-:Author: Pierre-Yves Chibon <pingou@pingoured.fr>
+:Author:  Pierre-Yves Chibon <pingou@pingoured.fr>
 
 
-Pagure is a light-weight git-centered forge based on pygit2.
+Pagure is a git-centered forge, python based using pygit2.
 
-Currently, Pagure offers a decent web-interface for git repositories, a
-simplistic ticket system (that needs improvements) and possibilities to create
-new projects, fork existing ones and create/merge pull-requests across or
-within projects.
+With pagure you can host your project with its documentation, let your users
+report issues or request enhancements using the ticketing system and build your
+community of contributors by allowing them to fork your projects and contribute
+to it via the now-popular pull-request mechanism.
 
 
 Homepage: https://pagure.io/pagure
 
 See it at work: https://pagure.io
 
+
 Playground version: https://stg.pagure.io
 
 
@@ -23,53 +24,58 @@ Playground version: https://stg.pagure.io
 Get it running
 ==============
 
+* Install the system libraries needed::
+
+    sudo dnf install git python-virtualenv libgit2-devel \
+                     libjpeg-devel gcc libffi-devel redhat-rpm-config
+
+  .. note:: Do note the version of libgit2 that you install, for example in
+    ``libgit2-0.23.4-1`` you need to keep in mind the ``0.23``
+
 * Retrieve the sources::
 
     git clone https://pagure.io/pagure.git
     cd pagure
 
-
 * Install dependencies
 
-  * development virtualenv::
+  * create the virtualenv::
 
-      dnf install libgit2-devel
-      virtualenv devel
-      devel/bin/pip install -r requirements.txt
+      virtualenv pagure_env
+      source ./pagure_env/bin/activate
 
-  * Fedora RPMs::
+  * Install the correct version of pygit2::
 
-      dnf install $(cat requirements-fedora.txt)
+      pip install pygit2==<version of libgit2 found>.*
 
+    So in our example::
 
-* Create the folder that will receive the projects, forks, docs and tickets'
-  git repo::
+      pip install pygit2==0.23.*
 
-    mkdir {repos,docs,forks,tickets}
+  * Install the rest of the dependencies::
 
+      pip install -r requirements.txt
 
-* Create the inital database scheme::
 
-    # development virtualenv only
-    source devel/bin/activate
+* Create the folder that will receive the projects, forks, docs, requests and
+  tickets' git repo::
+
+    mkdir {repos,docs,forks,tickets,requests}
+
+
+* Create the inital database scheme::
 
     python createdb.py
 
 
 * Run it::
 
-    # development virtualenv only
-    source devel/bin/activate
-
     ./runserver.py
 
 
 * To get some profiling information you can also run it as::
 
-    # development virtualenv only
-    source devel/bin/activate
-
     ./runserver.py --profile
 
 
-This will launch the application at http://127.0.0.1:5000
+This will launch the application at http://0.0.0.0:5000

From 7ab883b8c32883200a3193d9413862133a660b48 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jan 27 2016 15:43:12 +0000
Subject: [PATCH 2/4] Use the fedora-bootstrap version from apps.fp.o


---

diff --git a/pagure/templates/master.html b/pagure/templates/master.html
index 38244de..704bc75 100644
--- a/pagure/templates/master.html
+++ b/pagure/templates/master.html
@@ -5,7 +5,7 @@
     <title>{% block title %}{% endblock %} - Pagure</title>
     <link rel="shortcut icon" type="image/vnd.microsoft.icon"
         href="{{ url_for('static', filename='favicon.ico')}}"/>
-    <link href="https://ryanlerch.fedorapeople.org/fedora-bootstrap/fedora-bootstrap.css"
+    <link href="https://apps.fedoraproject.org/global/fedora-bootstrap-1.0.1/fedora-bootstrap.css"
         type="text/css" rel="stylesheet" />
     <link href="{{ url_for('static', filename='pagure.css') }}"
         type="text/css" rel="stylesheet" />
@@ -136,7 +136,7 @@
             filename='jquery-ui-1.11.2.custom.min.js') }}">
     </script>
     <script type="text/javascript"
-        src="https://ryanlerch.fedorapeople.org/fedora-bootstrap/fedora-bootstrap.js">
+        src="https://apps.fedoraproject.org/global/fedora-bootstrap-1.0.1/fedora-bootstrap.js">
     </script>
     <script type="text/javascript">
 $('[data-toggle="tooltip"]').tooltip({placement : 'bottom'});

From 5dc04aef63840bdf24a9d7b7fe1ba2ee04dc10b7 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jan 27 2016 15:55:50 +0000
Subject: [PATCH 3/4] Small re-wording to the README based on @puiterwijk's feedback


---

diff --git a/README.rst b/README.rst
index 0dc4741..ab5160e 100644
--- a/README.rst
+++ b/README.rst
@@ -24,7 +24,7 @@ Playground version: https://stg.pagure.io
 Get it running
 ==============
 
-* Install the system libraries needed::
+* Install the needed system libraries::
 
     sudo dnf install git python-virtualenv libgit2-devel \
                      libjpeg-devel gcc libffi-devel redhat-rpm-config
@@ -78,4 +78,4 @@ Get it running
     ./runserver.py --profile
 
 
-This will launch the application at http://0.0.0.0:5000
+This will launch the application at http://0.0.0.0:5000 or http://localhost:5000

From d0bf8c6360b17bd8189ef3668821f8858f35e256 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Jan 27 2016 16:04:21 +0000
Subject: [PATCH 4/4] Let's run pagure at 127.0.0.1


---

diff --git a/README.rst b/README.rst
index ab5160e..ee3ac2d 100644
--- a/README.rst
+++ b/README.rst
@@ -78,4 +78,4 @@ Get it running
     ./runserver.py --profile
 
 
-This will launch the application at http://0.0.0.0:5000 or http://localhost:5000
+This will launch the application at http://127.0.0.1:5000
diff --git a/runserver.py b/runserver.py
index 786da23..ad6774a 100755
--- a/runserver.py
+++ b/runserver.py
@@ -43,4 +43,4 @@ if args.config:
     os.environ['PAGURE_CONFIG'] = config
 
 APP.debug = True
-APP.run(host='0.0.0.0', port=int(args.port))
+APP.run(host='127.0.0.1', port=int(args.port))