A few minor tweaks to SSH repo instruction logic:
* more specific config name
* say "SVN" not "Git" on svn template
* safer defaults if the config values aren't set at all
* remove extraneous </a>
diff --git a/Allura/development.ini b/Allura/development.ini
index 79949bd..e4e0ffc 100644
--- a/Allura/development.ini
+++ b/Allura/development.ini
@@ -183,9 +183,9 @@
; List of social network options to use on user account settings
socialnetworks = Facebook, Linkedin, Twitter, Google+
-; Allow uploading ssh key, optionally set auth preferences url
+; Allow uploading ssh key, optionally set ssh preferences url
auth.allow_upload_ssh_key = false
-auth.preferences_url = /auth/preferences/
+auth.upload_ssh_url = /auth/preferences/
; In seconds
auth.recovery_hash_expiry_period = 600
diff --git a/ForgeGit/forgegit/templates/git/index.html b/ForgeGit/forgegit/templates/git/index.html
index 4d6fd15..4eaa869 100644
--- a/ForgeGit/forgegit/templates/git/index.html
+++ b/ForgeGit/forgegit/templates/git/index.html
@@ -76,8 +76,8 @@
<div class="message info scm-ssh-key">
<div class="content">
- {% if h.asbool(config.get('auth.allow_upload_ssh_key', True)) %} Did you get asked for your {{config.site_name}} password during this process? You can securely use your Git repository and avoid having to re-enter your password by <a href="{{config.get('auth.preferences_url')}}">setting up an ssh-key</a>.
- {% else %} Did you get asked for your {{config.site_name}} password during this process? You can securely use your Git repository and avoid having to re-enter your password by asking your server admin to enable uploading ssh keys</a>. {% endif %}
+ {% if h.asbool(config.get('auth.allow_upload_ssh_key')) %} Did you get asked for your {{config.site_name}} password during this process? You can securely use your Git repository and avoid having to re-enter your password by <a href="{{config.get('auth.upload_ssh_url', '/auth/preferences/')}}">setting up an ssh-key</a>.
+ {% else %} Did you get asked for your {{config.site_name}} password during this process? You can securely use your Git repository and avoid having to re-enter your password by asking your server admin to enable uploading ssh keys. {% endif %}
</div>
</div>
{% else %}
diff --git a/ForgeSVN/forgesvn/templates/svn/index.html b/ForgeSVN/forgesvn/templates/svn/index.html
index d074d1c..53f2e73 100644
--- a/ForgeSVN/forgesvn/templates/svn/index.html
+++ b/ForgeSVN/forgesvn/templates/svn/index.html
@@ -88,8 +88,8 @@
<div class="message info scm-ssh-key">
<div class="content">
- {% if h.asbool(config.get('auth.allow_upload_ssh_key', True)) %} Did you get asked for your {{config.site_name}} password during this process? You can securely use your Git repository and avoid having to re-enter your password by <a href="{{config.get('auth.preferences_url')}}">setting up an ssh-key</a>.
- {% else %} Did you get asked for your {{config.site_name}} password during this process? You can securely use your Git repository and avoid having to re-enter your password by asking your server admin to enable uploading ssh keys</a>. {% endif %}
+ {% if h.asbool(config.get('auth.allow_upload_ssh_key')) %} Did you get asked for your {{config.site_name}} password during this process? You can securely use your SVN repository and avoid having to re-enter your password by <a href="{{config.get('auth.upload_ssh_url', '/auth/preferences/')}}">setting up an ssh-key</a>.
+ {% else %} Did you get asked for your {{config.site_name}} password during this process? You can securely use your SVN repository and avoid having to re-enter your password by asking your server admin to enable uploading ssh keys. {% endif %}
</div>
</div>
{% else %}
