From 443463c92533e90d414a7b78aaaa3077cfd13f1b Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>
Date: Sun, 20 May 2018 22:48:21 +0200
Subject: [PATCH] Upgrade to 4.0.3

---
 conf/app.src           |  4 ++--
 conf/pagure.cfg.sample | 27 +++++----------------------
 conf/pagure.wsgi       |  8 +++++---
 manifest.json          |  2 +-
 scripts/install        |  8 ++++----
 5 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index fc7c29f..e2d098c 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://releases.pagure.org/pagure/pagure-3.13.2.tar.gz
-SOURCE_SUM=be22fe7918adf3cf7e037c6b76c19c48b2e4acd7da7c7fa11b05474052d8e868
+SOURCE_URL=https://releases.pagure.org/pagure/pagure-4.0.3.tar.gz
+SOURCE_SUM=1f9ae7381893995e364c92ee17a4dfd428adf642ed7c1d61873e196fd6c76359
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=false
diff --git a/conf/pagure.cfg.sample b/conf/pagure.cfg.sample
index 158d650..e5cc834 100644
--- a/conf/pagure.cfg.sample
+++ b/conf/pagure.cfg.sample
@@ -8,6 +8,10 @@ from datetime import timedelta
 # (ie: changing a project's or a user's settings)
 ADMIN_SESSION_LIFETIME = timedelta(minutes=20)
 
+# Enable tickets and docs for all repos
+ENABLE_TICKETS = True
+ENABLE_DOCS = True
+
 ### Secret key for the Flask application
 SECRET_KEY='__SECRET_KEY__'
 
@@ -44,7 +48,7 @@ APP_URL = 'https://__DOMAIN__/'
 ### The URL at which the documentation of projects will be available
 ## This should be in a different domain to avoid XSS issues since we want
 ## to allow raw html to be displayed (different domain, ie not a sub-domain).
-DOC_APP_URL = None
+DOC_APP_URL = 'https://docs.__DOMAIN__'
 
 ### The URL to use to clone git repositories.
 GIT_URL_SSH = 'ssh://git@__DOMAIN__/'
@@ -57,27 +61,6 @@ GIT_FOLDER = os.path.join(
     'repos'
 )
 
-### Folder containing the docs repos
-DOCS_FOLDER = os.path.join(
-    os.path.abspath(os.path.dirname(__file__)),
-    '..',
-    'docs'
-)
-
-### Folder containing the tickets repos
-TICKETS_FOLDER = os.path.join(
-    os.path.abspath(os.path.dirname(__file__)),
-    '..',
-    'tickets'
-)
-
-### Folder containing the pull-requests repos
-REQUESTS_FOLDER = os.path.join(
-    os.path.abspath(os.path.dirname(__file__)),
-    '..',
-    'requests'
-)
-
 ### Folder containing the clones for the remote pull-requests
 REMOTE_GIT_FOLDER = os.path.join(
     os.path.abspath(os.path.dirname(__file__)),
diff --git a/conf/pagure.wsgi b/conf/pagure.wsgi
index b945279..13ae6c5 100644
--- a/conf/pagure.wsgi
+++ b/conf/pagure.wsgi
@@ -23,6 +23,8 @@ import sys
 sys.path.insert(0, '__FINALPATH__/pagure/')
 
 
-# The most import line to make the wsgi working
-from pagure import APP as application
-#application.debug = True
+# The most important line to make the wsgi working
+from pagure.flask_app import create_app
+
+application = create_app()
+application.debug = True
diff --git a/manifest.json b/manifest.json
index faf5580..49adc51 100644
--- a/manifest.json
+++ b/manifest.json
@@ -8,7 +8,7 @@
 	"description": {
 		"en": "Pagure is a git-centered forge, python based using pygit2."
 	},
-	"version": "3.13.2-2",
+	"version": "4.0.3~ynh1",
 	"url": "https://pagure.io/pagure",
 	"license": "AGPL-3.0",
 	"maintainer": {
diff --git a/scripts/install b/scripts/install
index 2cea285..2652cc8 100755
--- a/scripts/install
+++ b/scripts/install
@@ -72,10 +72,10 @@ ynh_app_setting_set "$app" final_path "$final_path"
 # INSTALL DEPENDENCIES
 #=================================================
 
-ynh_install_app_dependencies git python-virtualenv libgit2-dev \
+ynh_install_app_dependencies git virtualenv python-virtualenv libgit2-dev \
                  libjpeg-dev gcc libffi-dev python-dev python-cffi \
-                 postgresql python-psycopg2 \
-                 uwsgi uwsgi-plugin-python
+                 python-gdbm python-psycopg2 \
+                 postgresql uwsgi uwsgi-plugin-python
 
 #=================================================
 # CREATE A PostgreSQL DATABASE
@@ -139,7 +139,7 @@ ynh_add_uwsgi_service
 #=================================================
 
 ynh_setup_source_local "${final_path}"
-ln -s "${final_path}/pagure-3.13.2" "${final_path}/pagure"
+ln -s "${final_path}/pagure-4.0.3" "${final_path}/pagure"
 
 #=================================================
 # PIP INSTALLATION