diff --git a/files/pagure.cfg.sample b/files/pagure.cfg.sample index 131d387..b152493 100644 --- a/files/pagure.cfg.sample +++ b/files/pagure.cfg.sample @@ -36,8 +36,8 @@ APP_URL = 'https://pagure.io/' DOC_APP_URL = 'https://docs.pagure.org' ### The URL to use to clone git repositories. -GIT_URL_SSH = 'git@pagure.io' -GIT_URL_GIT = 'git://pagure.io' +GIT_URL_SSH = 'ssh://git@pagure.io/' +GIT_URL_GIT = 'git://pagure.io/' ### Folder containing to the git repos GIT_FOLDER = os.path.join( diff --git a/pagure/default_config.py b/pagure/default_config.py index 30f2ebd..ad3d1e5 100644 --- a/pagure/default_config.py +++ b/pagure/default_config.py @@ -34,8 +34,8 @@ EMAIL_ERROR = 'pingou@pingoured.fr' APP_URL = 'https://pagure.org/' # The URL to use to clone the git repositories. -GIT_URL_SSH = 'git@pagure.org' -GIT_URL_GIT = 'git://pagure.org' +GIT_URL_SSH = 'ssh://git@pagure.org/' +GIT_URL_GIT = 'git://pagure.org/' # Number of items displayed per page diff --git a/pagure/templates/docs.html b/pagure/templates/docs.html index 4380afb..1393d81 100644 --- a/pagure/templates/docs.html +++ b/pagure/templates/docs.html @@ -15,13 +15,13 @@
If you already have a git repo:
- git remote add origin {{ config.get('GIT_URL_SSH') }}:docs/{{ repo.fullname }}.git
+ git remote add origin {{ config.get('GIT_URL_SSH') }}docs/{{ repo.fullname }}.git
git push -u origin master
If you have not created your git repo yet:
- git clone {{ config.get('GIT_URL_SSH') }}:docs/{{ repo.fullname }}.git
+ git clone {{ config.get('GIT_URL_SSH') }}docs/{{ repo.fullname }}.git
cd {{ repo.name }}
touch README.rst
git add README.rst
@@ -82,10 +82,10 @@
Git URLs:
- {{ config.get('GIT_URL_SSH') }}:docs/{{ repo.fullname }}.git
+ {{ config.get('GIT_URL_SSH') }}docs/{{ repo.fullname }}.git
- {{ config.get('GIT_URL_GIT') }}/docs/{{ repo.fullname }}.git
+ {{ config.get('GIT_URL_GIT') }}docs/{{ repo.fullname }}.git
diff --git a/pagure/templates/repo_info.html b/pagure/templates/repo_info.html
index e618796..cec067b 100644
--- a/pagure/templates/repo_info.html
+++ b/pagure/templates/repo_info.html
@@ -44,13 +44,13 @@
If you already have a git repo:
- git remote add origin {{ config.get('GIT_URL_SSH') }}:{% if repo.parent %}forks/{% endif %}{{ repo.fullname }}.git
+ git remote add origin {{ config.get('GIT_URL_SSH') }}{% if repo.parent %}forks/{% endif %}{{ repo.fullname }}.git
git push -u origin master
If you have not createt your git repo yet:
- git clone {{ config.get('GIT_URL_SSH') }}:{% if repo.parent %}forks/{% endif %}{{ repo.fullname }}.git
+ git clone {{ config.get('GIT_URL_SSH') }}{% if repo.parent %}forks/{% endif %}{{ repo.fullname }}.git
cd {{ repo.name }}
touch README.rst
git add README.rst
@@ -205,40 +205,40 @@
Project
:
- {{ config.get('GIT_URL_SSH') }}:{% if repo.parent %}forks/{% endif %}{{ repo.fullname }}.git
+ {{ config.get('GIT_URL_SSH') }}{% if repo.parent %}forks/{% endif %}{{ repo.fullname }}.git
- {{ config.get('GIT_URL_GIT') }}/{% if repo.parent %}forks/{% endif %}{{ repo.fullname }}.git
+ {{ config.get('GIT_URL_GIT') }}{% if repo.parent %}forks/{% endif %}{{ repo.fullname }}.git
Docs
:
- {{ config.get('GIT_URL_SSH') }}:docs/{{ repo.fullname }}.git
+ {{ config.get('GIT_URL_SSH') }}docs/{{ repo.fullname }}.git
- {{ config.get('GIT_URL_GIT') }}/docs/{{ repo.fullname }}.git
+ {{ config.get('GIT_URL_GIT') }}docs/{{ repo.fullname }}.git
Tickets
:
- {{ config.get('GIT_URL_SSH') }}:tickets/{{ repo.fullname }}.git
+ {{ config.get('GIT_URL_SSH') }}tickets/{{ repo.fullname }}.git
- {{ config.get('GIT_URL_GIT') }}/tickets/{{ repo.fullname }}.git
+ {{ config.get('GIT_URL_GIT') }}tickets/{{ repo.fullname }}.git
Requests
:
- {{ config.get('GIT_URL_SSH') }}:requests/{{ repo.fullname }}.git
+ {{ config.get('GIT_URL_SSH') }}requests/{{ repo.fullname }}.git
- {{ config.get('GIT_URL_GIT') }}/requests/{{ repo.fullname }}.git
+ {{ config.get('GIT_URL_GIT') }}requests/{{ repo.fullname }}.git
diff --git a/tests/test_pagure_flask_docs.py b/tests/test_pagure_flask_docs.py
index 4ab0378..c0767e4 100644
--- a/tests/test_pagure_flask_docs.py
+++ b/tests/test_pagure_flask_docs.py
@@ -97,7 +97,7 @@ class PagureFlaskDocstests(tests.Modeltests):
self.assertTrue('Docs
' in output.data)
self.assertTrue('This repo is brand new!
' in output.data)
self.assertTrue(
- 'git clone git@pagure.org:docs/test.git' in output.data)
+ 'git clone ssh://git@pagure.org/docs/test.git' in output.data)
repo.settings = {'project_documentation': False}
self.session.add(repo)
@@ -117,7 +117,7 @@ class PagureFlaskDocstests(tests.Modeltests):
self.assertTrue('Docs
' in output.data)
self.assertTrue('This repo is brand new!
' in output.data)
self.assertTrue(
- 'git clone git@pagure.org:docs/test.git' in output.data)
+ 'git clone ssh://git@pagure.org/docs/test.git' in output.data)
# forked doc repo
docrepo = os.path.join(tests.HERE, 'docs', 'test', 'test.git')