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

diff --git a/geonames/README.md b/geonames/README.md
index 83f9c6951e6cab17f0d20e72ffa7c3f9229ca513..ba90dc5d3a581f3bceb9613429b47f830d7e17b5 100644 (file)
--- a/geonames/README.md
+++ b/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

diff --git a/geonames/config/geonames.ini.php b/geonames/config/geonames.ini.php
index 500b88f226e77d0e0f7a1b0d46212eb7eb005e9e..280e7a93de4f21aa7f20c2d9c064ea056b2e145a 100644 (file)
--- a/geonames/config/geonames.ini.php
+++ b/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)

diff --git a/geonames/geonames.php b/geonames/geonames.php
index 7fdb43962cf3500f34df16d400d4a2e291939ed4..4cd1b27cbcdcd3b9298d243218b49ff9efb6cdf2 100644 (file)
--- a/geonames/geonames.php
+++ b/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

diff --git a/gravatar/README.md b/gravatar/README.md
index b2144f51f9230e822a6ecd6b92cbf13615f56518..b8ca8244de4eb32807bb6f32f68141dd36df51ef 100644 (file)
--- a/gravatar/README.md
+++ b/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

diff --git a/gravatar/config/gravatar.ini.php b/gravatar/config/gravatar.ini.php
index d71188565beb34ee34a0bf7c5a0c68025d83c135..a07005a3734cbc5bd9d58d10df501aad953f831c 100644 (file)
--- a/gravatar/config/gravatar.ini.php
+++ b/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)

diff --git a/impressum/README.md b/impressum/README.md
index 65ec454774023162d91c267804ad964dcb5a55f0..0d0aa51cdcfcfebb24b0480966c335b0f694d811 100644 (file)
--- a/impressum/README.md
+++ b/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

diff --git a/impressum/config/impressum.ini.php b/impressum/config/impressum.ini.php
index 93c03cc2110b2f2beb4d93bb5d35c798415b4d2f..1de4468c9e2d94e100b40a424174d0b4b8eeeb09 100644 (file)
--- a/impressum/config/impressum.ini.php
+++ b/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)

diff --git a/ldapauth/README b/ldapauth/README
index 9aac825826c4c357ab10935f51759890ea6d9cbd..03e8b0d4ec666e26d325fc2bb80c0d37c4428a2b 100644 (file)
--- a/ldapauth/README
+++ b/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]

diff --git a/ldapauth/config/ldapauth.ini.php b/ldapauth/config/ldapauth.ini.php
index 19d5549fd983fd21f802bc207d90e55ecd23802e..d707550bb1a4c94b457a4e07714b942f0ecf14f7 100644 (file)
--- a/ldapauth/config/ldapauth.ini.php
+++ b/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)

diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php
index 134a97df1f0dec9597ebf3c71f661af302a135cf..514fb1d1a89ade5565a827ce1292409e7cfec57e 100644 (file)
--- a/ldapauth/ldapauth.php
+++ b/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]

diff --git a/libravatar/README.md b/libravatar/README.md
index 99cddefc6786888c7ee671ca306bc08e6067a2a6..ca595be2082f4247313a40269de37c1b73a0abc0 100644 (file)
--- a/libravatar/README.md
+++ b/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

diff --git a/libravatar/config/libravatar.ini.php b/libravatar/config/libravatar.ini.php
index fccf6753f86bd5d6cc1c82b540c123ad7e868a53..e363120468459ca9ccfefadf8b8fa52c5433c194 100644 (file)
--- a/libravatar/config/libravatar.ini.php
+++ b/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)

diff --git a/mathjax/README.md b/mathjax/README.md
index 7108639a2ac9a5400b7fdc5b5b49b0a109317423..19407e86e583da476cd3ac86a5d134e803183f6f 100644 (file)
--- a/mathjax/README.md
+++ b/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];

diff --git a/mathjax/config/mathjax.ini.php b/mathjax/config/mathjax.ini.php
index d89ea69c6221dc3019afd09a82cc781c5e6c0136..261a732755c5981e134a6ad845c1cc117a072d48 100644 (file)
--- a/mathjax/config/mathjax.ini.php
+++ b/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)

diff --git a/openstreetmap/README b/openstreetmap/README
index 86ec4318132e4a326accc2efdfbf380e4b644dad..48402e29f10dbd88f82267773a2d54603248554e 100644 (file)
--- a/openstreetmap/README
+++ b/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

diff --git a/openstreetmap/config/openstreetmap.ini.php b/openstreetmap/config/openstreetmap.ini.php
index 38df95b67f0d9e998e2b2744ebb5115a40bd921b..986843b44e7417806c7d7e45aaf5a7818ab32691 100644 (file)
--- a/openstreetmap/config/openstreetmap.ini.php
+++ b/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)

diff --git a/piwik/README.md b/piwik/README.md
index 08fabe661e351709b63a0bd16e071101b18dbff1..2b2d1ce5b04cefc8f59ef6c7f954ddd8c08fa403 100644 (file)
--- a/piwik/README.md
+++ b/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/

diff --git a/piwik/config/piwik.ini.php b/piwik/config/piwik.ini.php
index 333d1320a70e37d9854db8688954180c6f7a0a80..b66c69c65ae24a22f297d860c3c4560f0cd2b71c 100644 (file)
--- a/piwik/config/piwik.ini.php
+++ b/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)

diff --git a/piwik/piwik.php b/piwik/piwik.php
index f001b27c27967ef8a7c621405eff6a9cc2a6f50f..5e34e0987b8298e1d1479ab92b1dd423384c97a4 100644 (file)
--- a/piwik/piwik.php
+++ b/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');

diff --git a/public_server/README.md b/public_server/README.md
index 02151478da7d5c1cf158c3cda95edccc666c51a1..7ba002e8952c47de3739bb3daa3ed8f3affa3aff 100644 (file)
--- a/public_server/README.md
+++ b/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.
 

diff --git a/public_server/config/public_server.ini.php b/public_server/config/public_server.ini.php
index 3c4166448a4b0790cef61cb9fce7491abf1e742b..79b2ef461d541268308a08e941f18853553a5fae 100644 (file)
--- a/public_server/config/public_server.ini.php
+++ b/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)

diff --git a/pumpio/README.md b/pumpio/README.md
index 8db84f6175d6c75ce5e91224a04be264b3b5ad7d..9fb01055a87627e7274b0a9277b4b95268684958 100644 (file)
--- a/pumpio/README.md
+++ b/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

diff --git a/pumpio/config/pumpio.ini.php b/pumpio/config/pumpio.ini.php
index 1840cea914c0228ae089191d34ba1bd8359956d5..cd5e732c0552ed2088a62949b55d1f3b82678f41 100644 (file)
--- a/pumpio/config/pumpio.ini.php
+++ b/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)

diff --git a/testdrive/README.md b/testdrive/README.md
index fc95918bcec82cad8fa9e8b1ac59e91c83c21b1f..ad9414eb5bb96bdda2da0a66958cd60f3d062cad 100644 (file)
--- a/testdrive/README.md
+++ b/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.

diff --git a/testdrive/config/testdrive.ini.php b/testdrive/config/testdrive.ini.php
index 253a21d8350a97992c5ff3e504edda952ef5fd04..8d3f86322f81bf47ac3bc7264db3bf530aafd73e 100644 (file)
--- a/testdrive/config/testdrive.ini.php
+++ b/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)

diff --git a/twitter/README.md b/twitter/README.md
index 7eaef8f43876499eed43826c3d023efb6eda6bb8..357180cc54d48768e8472072f518042ea8a51f11 100644 (file)
--- a/twitter/README.md
+++ b/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

diff --git a/twitter/config/twitter.ini.php b/twitter/config/twitter.ini.php
index a0b3deeda2d9ff34d875d1b75e98ae12506abbe7..5359fd6d628024f3c4b54956cdf71b2902f5f2f6 100644 (file)
--- a/twitter/config/twitter.ini.php
+++ b/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)

diff --git a/twitter/twitter.php b/twitter/twitter.php
index c865d1a165d88ef0baba668f4095c5f7ee740332..8b0387c87304bbe4cb1f2872227209b2778649f7 100644 (file)
--- a/twitter/twitter.php
+++ b/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