[various] Remove config/addon.config.php in favor of per-addon configuration file

twitter/README.md

@@ -24,12 +24,14 @@ Open the `config/local.config.php` file and add "twitter" to the list of activat
         ...
     ]
 
-Add your key pair to your global `config/addon.config.php`.
+Add your key pair to your `config/twitter.config.php` file.
 
-	'twitter' => [
-		'consumerkey' => 'your consumer_key here',
-		'consumersecret' => 'your consumer_secret here',
-	],
+	return [
+		'twitter' => [
+			'consumerkey' => 'your consumer_key here',
+			'consumersecret' => 'your consumer_secret here',
+		],
+	];
 
 After this, users can configure their Twitter account settings from "Settings -> Addon Settings".
 

twitter/config/twitter.config.php

@@ -1,7 +1,7 @@
 <?php
 
 // Warning: Don't change this file! It only holds the default config values for this addon.
-// Instead overwrite these config values in config/addon.config.php in your Friendica directory
+// Instead, copy this file to config/twitter.config.php in your Friendica directory and set the correct values there
 
 return [
 	'twitter' => [

twitter/twitter.php

@@ -48,12 +48,14 @@
  *     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/addon.config.php or use the admin panel.
+ *     Add this key pair to your config/twitter.config.php file or use the admin panel.
  *
- *     	'twitter' => [
- * 		    'consumerkey' => '',
- *  		'consumersecret' => '',
- *      ],
+ *     	return [
+ *          'twitter' => [
+ * 		        'consumerkey' => '',
+ *  		    'consumersecret' => '',
+ *          ],
+ *      ];
  *
  *     To activate the addon itself add it to the system.addon
  *     setting. After this, your user can configure their Twitter account settings