Move addon-specific config to config/addon.ini.php

geonames/README.md

@@ -7,7 +7,7 @@ Use Geonames service to resolve nearest populated location for given latitude, l
 
 ## Installation
 
-Pre-requisite: Register a username at geonames.org and set in config/local.ini.php
+Pre-requisite: Register a username at geonames.org and set in config/addon.ini.php
 
     [geonames]
     username = your_username

geonames/config/geonames.ini.php

@@ -1,7 +1,7 @@
 <?php return <<<INI
 
 ; Warning: Don't change this file! It only holds the default config values for this addon.
-; Instead overwrite these config values in config/local.ini.php in your Friendica directory
+; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
 
 [geonames]
 ; username (String)

geonames/geonames.php

@@ -7,7 +7,7 @@
  *
  *
  * Pre-requisite: Register a username at geonames.org
- * and set in config/local.ini.php
+ * and set in config/addon.ini.php
  *
  * [geonames]
  * username = your_username

gravatar/README.md

@@ -35,7 +35,7 @@ Open the config/local.ini.php file and add "gravatar" to the list of activated a
         [system]
 		addon = ...,gravatar
 
-You can add two configuration variables for the addon:
+You can add two configuration variables for the addon to the config/addon.ini.php file:
 
         [gravatar]
 		default_avatar = identicon

gravatar/config/gravatar.ini.php

@@ -1,7 +1,7 @@
 <?php return <<<INI
 
 ; Warning: Don't change this file! It only holds the default config values for this addon.
-; Instead overwrite these config values in config/local.ini.php in your Friendica directory
+; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
 
 [gravatar]
 ; default_avatar (String)

impressum/README.md

@@ -16,7 +16,7 @@ Simply fill in the fields in the impressium settings page in the addons area of
 
 Manual Configuration
 --------------------
-If you for any reason you prefer to use a configuration file instead, you can set the following variables in the config/local.ini.php file
+If you for any reason you prefer to use a configuration file instead, you can set the following variables in the config/addon.ini.php file
 
 	[impressum]
 	owner =           this is the Name of the Operator

impressum/config/impressum.ini.php

@@ -1,7 +1,7 @@
 <?php return <<<INI
 
 ; Warning: Don't change this file! It only holds the default config values for this addon.
-; Instead overwrite these config values in config/local.ini.php in your Friendica directory
+; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
 
 [impressum]
 ; owner (String)

ldapauth/README

@@ -10,7 +10,7 @@ However, it's possible with an option to automate the creation of a Friendica ba
 Note when using with Windows Active Directory: you may need to set TLS_CACERT in your site
 ldap.conf file to the signing cert for your LDAP server.
 
-The configuration options for this module may be set in the config/local.ini.php file
+The configuration options for this module may be set in the config/addon.ini.php file
 e.g.:
 
 	[ldapauth]

ldapauth/config/ldapauth.ini.php

@@ -1,7 +1,7 @@
 <?php return <<<INI
 
 ; Warning: Don't change this file! It only holds the default config values for this addon.
-; Instead overwrite these config values in config/local.ini.php in your Friendica directory
+; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
 
 [ldapauth]
 ; ldap_server (String)

ldapauth/ldapauth.php

@@ -26,7 +26,7 @@
  * Note when using with Windows Active Directory: you may need to set TLS_CACERT in your site
  * ldap.conf file to the signing cert for your LDAP server.
  *
- * The configuration options for this module may be set in the config/local.ini.php file
+ * The configuration options for this module may be set in the config/addon.ini.php file
  * e.g.:
  *
  * [ldapauth]

libravatar/README.md

@@ -31,7 +31,7 @@ Open the config/local.ini.php file and add "libravatar" to the list of activated
         [system]
 		addon = ...,libravatar
 
-You can add one configuration variables for the addon:
+You can add one configuration variables for the addon to the config/addon.ini.php file:
 
         [libravatar]
 		default_avatar = identicon

libravatar/config/libravatar.ini.php

@@ -1,7 +1,7 @@
 <?php return <<<INI
 
 ; Warning: Don't change this file! It only holds the default config values for this addon.
-; Instead overwrite these config values in config/local.ini.php in your Friendica directory
+; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
 
 [libravatar]
 ; default_avatar (String)

mathjax/README.md

@@ -21,12 +21,12 @@ In case you want to use the CDN you can try the following URL as a quick start
 	http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS_HTML
 
 In case you don't want or can use the admin panel of Friendica you can activate
-the addon by adding _mathjax_ to the
+the addon by adding _mathjax_ to the list in your config/local.ini.php file
 
 	[system]
 	addon = ...,mathjax
 
-list in your config/local.ini.php file and then providing the base URL after that
+and then providing the base URL after that in the config/addon.ini.php file
 
 	[mathjax]
 	baseurl = [the URL to your MathJax installation];

mathjax/config/mathjax.ini.php

@@ -1,7 +1,7 @@
 <?php return <<<INI
 
 ; Warning: Don't change this file! It only holds the default config values for this addon.
-; Instead overwrite these config values in config/local.ini.php in your Friendica directory
+; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
 
 [mathjax]
 ; baseurl (String)

openstreetmap/README

@@ -38,7 +38,7 @@ addons.
     [system]
 	addon = ...,openstreetmap
 
-You can change two configuration variables for the addon:
+You can change two configuration variables for the addon in the config/addon.ini.php file:
 
 	[openstreetmap]
 	tmsserver = https://www.openstreetmap.org

openstreetmap/config/openstreetmap.ini.php

@@ -1,7 +1,7 @@
 <?php return <<<INI
 
 ; Warning: Don't change this file! It only holds the default config values for this addon.
-; Instead overwrite these config values in config/local.ini.php in your Friendica directory
+; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
 
 [openstreetmap]
 ; tmsserver (String)

piwik/README.md

@@ -27,7 +27,7 @@ Open the config/local.ini.php file and add "piwik" to the list of activated addo
     [system]
 	addon = ...,piwik
 
-You can change 4 more configuration variables for the addon:
+You can change 4 more configuration variables for the addon in the config/addon.ini.php file:
 
     [piwik]
 	baseurl = example.com/piwik/

piwik/config/piwik.ini.php

@@ -1,7 +1,7 @@
 <?php return <<<INI
 
 ; Warning: Don't change this file! It only holds the default config values for this addon.
-; Instead overwrite these config values in config/local.ini.php in your Friendica directory
+; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
 
 [piwik]
 ; baseurl (String)

piwik/piwik.php

@@ -16,7 +16,7 @@
  *
  *   Configuration:
  *     Use the administration panel to configure the Piwik tracking addon, or
- *     in case you don't use this add the following lines to your config/local.ini.php
+ *     in case you don't use this add the following lines to your config/addon.ini.php
  *     file:
  *
  *     [piwik]
@@ -63,7 +63,7 @@ function piwik_analytics($a,&$b) {
 	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/piwik/piwik.css' . '" media="all" />';
 
 	/*
-	 *   Get the configuration variables from the config/local.ini.php file.
+	 *   Get the configuration variables from the config/addon.ini.php file.
 	 */
 	$baseurl = Config::get('piwik', 'baseurl');
 	$siteid  = Config::get('piwik', 'siteid');

public_server/README.md

@@ -19,7 +19,7 @@ This is a modified version of the testdrive addon, DO NOT ACTIVATE AT THE SAME T
     flagposts = 90
     flagpostsexpire = 146
 
-Set these in your config/local.ini.php file. By default nothing is defined in case the addon is activated accidentally.
+Set these in your config/addon.ini.php file. By default nothing is defined in case the addon is activated accidentally.
 They can be ommitted or set to 0 to disable each option.
 The default values are those used by friendica.eu, change these as desired.
 

public_server/config/public_server.ini.php

@@ -1,7 +1,7 @@
 <?php return <<<INI
 
 ; Warning: Don't change this file! It only holds the default config values for this addon.
-; Instead overwrite these config values in config/local.ini.php in your Friendica directory
+; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
 
 [public_server]
 ; expiredays (Integer)

pumpio/README.md

@@ -1,4 +1,4 @@
-To let the connector work properly you should define an application name in config/local.ini.php:
+To let the connector work properly you should define an application name in config/addon.ini.php:
 
 [pumpio]
 application_name = Name of you site

pumpio/config/pumpio.ini.php

@@ -1,7 +1,7 @@
 <?php return <<<INI
 
 ; Warning: Don't change this file! It only holds the default config values for this addon.
-; Instead overwrite these config values in config/local.ini.php in your Friendica directory
+; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
 
 [pumpio]
 ; application_name (String)

testdrive/README.md

@@ -9,7 +9,7 @@ When an account is created on the site, it is given a hard expiration date of
 	[testdrive]
 	expiredays = 30
 
-Set this in your config/local.ini.php file to allow a 30 day test drive period.
+Set this in your config/addon.ini.php file to allow a 30 day test drive period.
 By default no expiration period is defined in case the addon is activated accidentally.
 
 There is no opportunity to extend an expired account using this addon.

testdrive/config/testdrive.ini.php

@@ -1,7 +1,7 @@
 <?php return <<<INI
 
 ; Warning: Don't change this file! It only holds the default config values for this addon.
-; Instead overwrite these config values in config/local.ini.php in your Friendica directory
+; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
 
 [testdrive]
 ; expiredays (Integer)

twitter/README.md

@@ -16,7 +16,7 @@ After the registration please enter the values for "Consumer Key" and "Consumer
 
 ## Alternative configuration
 
-Add your key pair to your global config/local.ini.php.
+Add your key pair to your global config/addon.ini.php.
 
     [twitter]
     consumerkey = your consumer_key here

twitter/config/twitter.ini.php

@@ -1,7 +1,7 @@
 <?php return <<<INI
 
 ; Warning: Don't change this file! It only holds the default config values for this addon.
-; Instead overwrite these config values in config/local.ini.php in your Friendica directory
+; Instead overwrite these config values in config/addon.ini.php in your Friendica directory
 
 [twitter]
 ; consumerkey (String)

twitter/twitter.php

@@ -48,7 +48,7 @@
  *     we do not need "Twitter as login". When you've registered the app you get the
  *     OAuth Consumer key and secret pair for your application/site.
  *
- *     Add this key pair to your global config/local.ini.php or use the admin panel.
+ *     Add this key pair to your global config/addon.ini.php or use the admin panel.
  *
  *     [twitter]
  *     consumerkey = your consumer_key here