Ticket #4253 (closed Patches: fixed)

Opened 2 years ago

Last modified 2 years ago

Cleanup of amportal.conf

Reported by: drmessano Assigned to:
Priority: minor Milestone: 2.8
Component: FreePBX Framework Version: 2.8-branch
Keywords: amportal.conf Cc:
Confirmation: Unreviewed SVN Revision (if applicable):
Backend Engine: All Backend Engine Version:

Description

Here is an attempt to cleanup amportal.conf. Some of the verbiage has been cleaned up, some of the config options have been consolidated and reorganized, examples are displayed more consistently, and we've removed some defaults that are explicitly set (defaults are defaults; we don't need to SET these redundantly).

Attachments

amportal.conf.diff (21.6 kB) - added by drmessano on 05/30/10 11:01:02.
amportal.conf (12.7 kB) - added by drmessano on 05/30/10 11:01:32.
Full amportal.conf

Change History

(follow-up: ↓ 2 ) 05/05/10 00:04:52 changed by mickecarlsson

Just a quick glance at it, you removed: 

ARI_ADMIN_USERNAME=admin 
# This is the default admin name used to allow an administrator to login to ARI bypassing all security. 
# Change this to whatever you want, don't forget to change the ARI_ADMIN_PASSWORD as well 
ARI_ADMIN_PASSWORD=ari_password

Those entries must stay, it is added for trunk and will be included in next release so that a warning is displayed in the dashboard warning users about the not so well known admin password.

(in reply to: ↑ 1 ; follow-up: ↓ 3 ) 05/17/10 23:05:10 changed by drmessano

Replying to mickecarlsson:

Just a quick glance at it, you removed: {{{ ARI_ADMIN_USERNAME=admin # This is the default admin name used to allow an administrator to login to ARI bypassing all security. # Change this to whatever you want, don't forget to change the ARI_ADMIN_PASSWORD as well ARI_ADMIN_PASSWORD=ari_password }}} Those entries must stay, it is added for trunk and will be included in next release so that a warning is displayed in the dashboard warning users about the not so well known admin password.

Those were not removed. They were moved to a more sensible place in the file.

(in reply to: ↑ 2 ) 05/17/10 23:07:07 changed by drmessano

Replying to drmessano:

Replying to mickecarlsson:

Just a quick glance at it, you removed: {{{ ARI_ADMIN_USERNAME=admin # This is the default admin name used to allow an administrator to login to ARI bypassing all security. # Change this to whatever you want, don't forget to change the ARI_ADMIN_PASSWORD as well ARI_ADMIN_PASSWORD=ari_password }}} Those entries must stay, it is added for trunk and will be included in next release so that a warning is displayed in the dashboard warning users about the not so well known admin password.

Those were not removed. They were moved to a more sensible place in the file.

Lines 67-73 to be precise.

05/17/10 23:47:41 changed by mickecarlsson

Ahh, it helps to actually patch the file instead of glancing through the diff. Thanks for the clarification.

05/21/10 13:27:34 changed by p_lindheimer

  • owner deleted.
  • component changed from Core to FreePBX Framework.

drmessano,

I just tried applying your patch against ampotal.conf in trunk and it partially fails. Can you regenerate the patch against trunk so I can apply it, have a look and most likely check it in?

I am assuming that nothing is removed? (sorry in advance if you said that above, I did not read the whole thread)

05/30/10 11:01:02 changed by drmessano

  • attachment amportal.conf.diff added.

05/30/10 11:01:32 changed by drmessano

  • attachment amportal.conf added.

Full amportal.conf

05/30/10 11:10:37 changed by drmessano

Note: The unused backup options have been removed from the file, as confirmed on IRC. Everything else was MOVED and placed in a more suitable location. The amportal.conf was based on LATEST TRUNK, so no new additions were omitted.

Options have proper syntax noted now, and some options which were explicitly set in amportal.conf as the already existing default were removed. An example would be where someoption=true was set in amportal.conf and the hardcoded default was already someoption=true. This appears to have been set in some places as a syntax example, where a properly commented out syntax example showing #someoption=true|false was more inline with proper documentation. All of the defaults have been CONFIRMED within existing code.

05/30/10 11:26:30 changed by p_lindheimer

  • status changed from new to closed.
  • resolution set to fixed.

(In [9787]) closes #4253 cleanup default amportal.conf file (note: the patch still did not apply but the full copy was used so it should be good but please confirm)

07/13/10 18:02:34 changed by p_lindheimer

(In [10122]) Merged revisions 9746-9768,9770-10121 via svnmerge from http://www.freepbx.org/v2/svn/freepbx/branches/2.8

................

r9750 | p_lindheimer | 2010-05-25 10:10:09 -0700 (Tue, 25 May 2010) | 1 line

closes #4256 make all versions of parse_amportal_conf() use the same preg_match() line using framework's functions.inc.php as authoritative

................

r9770 | mickecarlsson | 2010-05-26 11:17:11 -0700 (Wed, 26 May 2010) | 1 line

Reverted r7730 so that amportal setting SERVERINTITLE starts working again. See also #4299

................

r9771 | mbrevda | 2010-05-26 11:30:20 -0700 (Wed, 26 May 2010) | 1 line

re: #4300; bug fix for firefox. IE wont remember expanded state between page reload, everything else seems to be working.

................

r9772 | mickecarlsson | 2010-05-26 22:11:01 -0700 (Wed, 26 May 2010) | 1 line

Close #4299 adds hostname in header for gui

................

r9777 | p_lindheimer | 2010-05-28 11:34:16 -0700 (Fri, 28 May 2010) | 1 line

closes #4306 make lnav sections expandable/collapse-able

................

r9779 | p_lindheimer | 2010-05-29 09:33:15 -0700 (Sat, 29 May 2010) | 1 line

revert r9772 re #4299 we are not going to call hostname on every call in addition to it has the potential of messing up the display with an unknown length and could have other un-forseen consequences (and if we were going to do this, we should be using php gethostname() (and then defining a substitute for php versions that don't have that function

................

r9780 | p_lindheimer | 2010-05-29 10:01:36 -0700 (Sat, 29 May 2010) | 1 line

fixes #4307 unable to press apply configuration changes bar. Please open a new bug for IE, tested to work on FF, Safari, Chrome - so something is up with IE or there is some sort of bug/mis-matched html tag or something that the others are immune to...

................

r9781 | p_lindheimer | 2010-05-29 10:25:39 -0700 (Sat, 29 May 2010) | 1 line

fix some formatting so viewing source pages is easier, and adds a closing div that appeared to be missing

................

r9782 | p_lindheimer | 2010-05-29 10:51:30 -0700 (Sat, 29 May 2010) | 1 line

removes the div that was wrapping a group of li tags (I don't think you can do that) which was messing up IE, however IE still can not reload, the modal orange box never comes up, re #4307

................

r9784 | mickecarlsson | 2010-05-29 13:56:17 -0700 (Sat, 29 May 2010) | 1 line

Fixed spelling error

................

r9787 | p_lindheimer | 2010-05-30 09:26:29 -0700 (Sun, 30 May 2010) | 1 line

closes #4253 cleanup default amportal.conf file (note: the patch still did not apply but the full copy was used so it should be good but please confirm)

................

r9788 | p_lindheimer | 2010-05-30 10:45:15 -0700 (Sun, 30 May 2010) | 1 line

add title to categories saying they can click to expand/collapse the section

................

r9799 | p_lindheimer | 2010-06-01 13:06:54 -0700 (Tue, 01 Jun 2010) | 1 line

closes #4311 use freepbx_menu.conf to make modifications to left navigation menu, if file is not present then the code path remains unchanged

................

r9812 | p_lindheimer | 2010-06-02 10:22:00 -0700 (Wed, 02 Jun 2010) | 13 lines

Merged revisions 9634-9729,9733-9795,9798-9811 via svnmerge from http://www.freepbx.org/v2/svn/freepbx/branches/2.7

........

r9634 | p_lindheimer | 2010-05-14 07:10:47 -0700 (Fri, 14 May 2010) | 1 line

fixes #4269 enclose clid_format in quotes

........

r9811 | p_lindheimer | 2010-06-02 10:09:25 -0700 (Wed, 02 Jun 2010) | 1 line

fixes #4255 enclose the full set of searchstrings in ()

........

................

r9814 | p_lindheimer | 2010-06-02 13:19:02 -0700 (Wed, 02 Jun 2010) | 1 line

dont't run category through htmlspecialchars as only moh uses it, do it there since it breaks other things re: #4179

................

r9831 | p_lindheimer | 2010-06-15 10:34:02 -0700 (Tue, 15 Jun 2010) | 1 line

fixes #4345 fail an install when install.php or install.sql (or unintall versions) fails

................

r9833 | GameGamer?43 | 2010-06-15 12:02:29 -0700 (Tue, 15 Jun 2010) | 1 line

closes #4333 - check if outboundCID is set and it's not set to nothing

................

r9834 | GameGamer?43 | 2010-06-15 12:08:17 -0700 (Tue, 15 Jun 2010) | 1 line

closes #4331 - added ext_meetmeadmin class, to handle the management of meetme conferences from within freepbx

................

r9836 | p_lindheimer | 2010-06-15 13:09:42 -0700 (Tue, 15 Jun 2010) | 1 line

closes #4339 add displayconnects=no as default value, only helps with 1.6+

................

r9877 | p_lindheimer | 2010-06-18 12:22:07 -0700 (Fri, 18 Jun 2010) | 1 line

add template for freepbx_menu.conf allowing lnav manipulation from the defaults re #4311

................

r9891 | p_lindheimer | 2010-06-22 11:46:43 -0700 (Tue, 22 Jun 2010) | 1 line

fixes #4366 and fixes #4354 guielements should not be trying to do translations on passed in values, this should be done in the calling module prior to passing in the value

................

r9917 | mbrevda | 2010-06-25 05:10:30 -0700 (Fri, 25 Jun 2010) | 1 line

re #4369, migrate before the user can hit reload

................

r9919 | mbrevda | 2010-06-25 08:02:08 -0700 (Fri, 25 Jun 2010) | 1 line

re #4369, remove time condition migration, that should be done from thre CC module; also remove core_get_routes function to avoid any conflicts with the same function name further down the line

................

r9922 | p_lindheimer | 2010-06-25 11:09:36 -0700 (Fri, 25 Jun 2010) | 1 line

define sql() if not defined, some install methods does not have this function defined

................

r9933 | p_lindheimer | 2010-06-25 12:52:35 -0700 (Fri, 25 Jun 2010) | 1 line

Creating release 2.8.0rc1

................

r9958 | mickecarlsson | 2010-06-26 06:29:32 -0700 (Sat, 26 Jun 2010) | 1 line

Updated amp.pot

................

r9959 | mickecarlsson | 2010-06-26 06:30:59 -0700 (Sat, 26 Jun 2010) | 1 line

Added missing license text

................

r9960 | mickecarlsson | 2010-06-26 06:32:21 -0700 (Sat, 26 Jun 2010) | 1 line

Updated language tool

................

r9961 | p_lindheimer | 2010-06-26 09:17:47 -0700 (Sat, 26 Jun 2010) | 1 line

closes #4376 setting repository select box to extended if such modules are present, also changes 'type' form tool to what ever is currently selected

................

r9967 | mickecarlsson | 2010-06-27 03:17:51 -0700 (Sun, 27 Jun 2010) | 1 line

Updated amp.pot with latest changes

................

r9970 | mickecarlsson | 2010-06-27 10:02:16 -0700 (Sun, 27 Jun 2010) | 1 line

Updated all amp languages for 2.8

................

r9977 | p_lindheimer | 2010-06-28 11:20:44 -0700 (Mon, 28 Jun 2010) | 1 line

fixes #4382 enapsulate symlinking/copying into a class with error reporting at end

................

r9985 | p_lindheimer | 2010-06-28 18:37:10 -0700 (Mon, 28 Jun 2010) | 1 line

fixes #4386 don't generate an orphaned basetag if no extenions exists, fail at that point instead

................

r9999 | p_lindheimer | 2010-06-29 14:49:29 -0700 (Tue, 29 Jun 2010) | 1 line

fixes #4389 dahdi compatibility mode broken, 1.4 still has legacy zap applications even when in DAHDI mode so can't count on those

................

r10003 | p_lindheimer | 2010-06-30 08:47:03 -0700 (Wed, 30 Jun 2010) | 1 line

include module js files after all the standard js files as they will typically require things like standard jquery libraries, etc.

................

r10005 | p_lindheimer | 2010-06-30 14:11:31 -0700 (Wed, 30 Jun 2010) | 1 line

perl version no longer used

................

r10007 | p_lindheimer | 2010-06-30 14:36:30 -0700 (Wed, 30 Jun 2010) | 1 line

make freepbx_featurecodes.conf a template so it does not get read every time unless use is using it

................

r10010 | p_lindheimer | 2010-06-30 15:16:06 -0700 (Wed, 30 Jun 2010) | 1 line

fixes #4388 don't symlink from other fw_fop, fw_ari, fw_langpack modules, they are like framework also re #4382 leftover code deleted

................

r10027 | mickecarlsson | 2010-07-03 01:48:04 -0700 (Sat, 03 Jul 2010) | 1 line

amportal.conf: small spelling error

................

r10028 | p_lindheimer | 2010-07-03 09:35:06 -0700 (Sat, 03 Jul 2010) | 1 line

remove warning from incorrect (but harmless) call to connectdirs::create() re #4400

................

r10037 | mickecarlsson | 2010-07-07 01:07:26 -0700 (Wed, 07 Jul 2010) | 1 line

Re #4402 change from split to explode in callmonitor.module

................

r10038 | p_lindheimer | 2010-07-07 14:44:25 -0700 (Wed, 07 Jul 2010) | 1 line

if destination file is a different symlink or an actual file, and the md5 of the files are identical, then don't complain, just write out an error log re #4388

................

r10040 | p_lindheimer | 2010-07-07 14:54:28 -0700 (Wed, 07 Jul 2010) | 9 lines

Merged revisions 10019 via svnmerge from http://www.freepbx.org/v2/svn/freepbx/branches/2.7

........

r10019 | p_lindheimer | 2010-07-01 07:12:54 -0700 (Thu, 01 Jul 2010) | 1 line

fixes #4185 use DAHDI channels when compatibility mode is used

........

................

r10041 | mbrevda | 2010-07-08 03:07:17 -0700 (Thu, 08 Jul 2010) | 1 line

closes #4403; symlink ari_modules dir on reload

................

r10044 | p_lindheimer | 2010-07-08 10:45:30 -0700 (Thu, 08 Jul 2010) | 1 line

create 2.8.0 release dir and migration script to add preloads if needed to modules.conf re #3963 and re #4411

................

r10045 | mickecarlsson | 2010-07-08 11:54:17 -0700 (Thu, 08 Jul 2010) | 1 line

Fixes typo

................

r10047 | mickecarlsson | 2010-07-08 12:00:17 -0700 (Thu, 08 Jul 2010) | 1 line

Fix that typo again

................

r10050 | p_lindheimer | 2010-07-08 12:19:33 -0700 (Thu, 08 Jul 2010) | 1 line

change struture for ari module symlinks to accomodate other assets re #4403

................

r10053 | p_lindheimer | 2010-07-09 09:32:37 -0700 (Fri, 09 Jul 2010) | 1 line

fixes #4413 don't change permissions on hidden folders in ASTVARLIBDIR to keep from affecting anything in the .ssh folder

................

r10054 | p_lindheimer | 2010-07-09 16:53:14 -0700 (Fri, 09 Jul 2010) | 1 line

closes #4418 adds ability for modules to include js scripts into the <head> of the page

................

r10055 | p_lindheimer | 2010-07-09 23:21:44 -0700 (Fri, 09 Jul 2010) | 1 line

keep apply config bar from fading if DEVELRELOAD is set

................

r10100 | mbrevda | 2010-07-12 02:50:42 -0700 (Mon, 12 Jul 2010) | 1 line

closes #4423; dont display a blamk page in ari if fm is not enabled

................

r10101 | mbrevda | 2010-07-12 02:53:02 -0700 (Mon, 12 Jul 2010) | 1 line

closes #4423; dont display a blamk page in ari if fm is not enabled

................

r10108 | p_lindheimer | 2010-07-13 08:30:28 -0700 (Tue, 13 Jul 2010) | 1 line

provide the src module when reporting symlink errors

................

r10109 | p_lindheimer | 2010-07-13 09:58:44 -0700 (Tue, 13 Jul 2010) | 1 line

use the extended repository when checking modules if Third Party Modules are present (used by automatic update checker), re #4376 and will also help re #4385 since the modules will show as new if the normal repository is ever checked followed by the extended repository

................

r10111 | p_lindheimer | 2010-07-13 15:53:18 -0700 (Tue, 13 Jul 2010) | 1 line

Creating release 2.8.0

................