Permalink
Browse files

little reorder in application.yml.example and only show donations in …

…sidebar if paypal stuff is set
  • Loading branch information...
1 parent 510bd7f commit 78e03056e8fd14c5218c18e7375e07f85108934d @jhass jhass committed Nov 6, 2011
Showing with 28 additions and 27 deletions.
  1. +1 −1 app/views/shared/_right_sections.html.haml
  2. +27 −26 config/application.yml.example
@@ -76,7 +76,7 @@
.content
!= t('bookmarklet.explanation', :link => link_to(t('bookmarklet.explanation_link_text'), bookmarklet))
-- if ! AppConfig['do_not_request_donations']
+- if AppConfig[:paypal_hosted_button_id].present?
.section
.title
= image_tag('/images/icons/coffee.png')
@@ -66,14 +66,15 @@ defaults: &defaults
# Email to send spotlight suggestions to
spotlight_suggest_email: ''
- # Set this to true to remove the donation request form in the right sidebar
- do_not_request_donations: false
-
# List of users who have admin privileges
# (expressed as an array of local usernames)
admins:
- 'example_user1dsioaioedfhgoiesajdigtoearogjaidofgjo'
+ # Mount resque-web into routes
+ # This allows an administrator to see info about the workers
+ mount_resque_web: true
+
# Logging setup
# Enable extensive logging to log/{development,test,production}.log
@@ -153,6 +154,27 @@ defaults: &defaults
# Sender address in Diaspora's outgoing mail.
smtp_sender_address: 'no-reply@joindiaspora.com'
+ # Redis cache
+
+ # Enable the cache layer (Redis)
+ # If you expect to have thousands of users on your pod,
+ # we *highly* suggest you enable this.
+ #
+ # By default, the cache layer will piggyback off of the Redis
+ # database used by your Resque workers.
+ redis_cache: false
+
+ # The location of your redis cache.
+ # IMPORTANT: DO NOT CHANGE THIS IF YOU DO NOT KNOW WHAT YOU ARE DOING!
+ #
+ # Leave this blank to use the same Redis database
+ # that your Resque workers use (happy path).
+ #
+ # This takes an ip (or DNS record). It assumes that your Redis database
+ # is running on the default Redis port.
+ redis_location: ''
+
+
# Web tracking
# google analytics key - if false, no javascript included
@@ -170,32 +192,11 @@ defaults: &defaults
cloudfiles_api_key: 'abc123'
# Donations
-
+
+ # Leave this blank to not show the request for donations
# Use paypal for recurring donations
paypal_hosted_button_id: ""
- # Mount resque-web into routes
- # This allows an administrator to see info about the workers
- mount_resque_web: true
-
- # Enable the cache layer (Redis)
- # If you expect to have thousands of users on your pod,
- # we *highly* suggest you enable this.
- #
- # By default, the cache layer will piggyback off of the Redis
- # database used by your Resque workers.
- redis_cache: false
-
- # The location of your redis cache.
- # IMPORTANT: DO NOT CHANGE THIS IF YOU DO NOT KNOW WHAT YOU ARE DOING!
- #
- # Leave this blank to use the same Redis database
- # that your Resque workers use (happy path).
- #
- # This takes an ip (or DNS record). It assumes that your Redis database
- # is running on the default Redis port.
- redis_location: ''
-
#
# Use this section to override default settings in specific environments
#

0 comments on commit 78e0305

Please sign in to comment.