diff options
| author | Daniel Stefan Haischt <dsh@pfsense.org> | 2007-09-01 04:10:13 +0000 |
|---|---|---|
| committer | Daniel Stefan Haischt <dsh@pfsense.org> | 2007-09-01 04:10:13 +0000 |
| commit | 9f2521ca8351e454e03193ddccbf5eb2166ec1fd (patch) | |
| tree | 2df2d2ba5cf8123d90bb81b1039c3cec071330e0 | |
| parent | 188234df1c9d986f8a7fc80d0f57cbd91125fb14 (diff) | |
| download | pfsense-packages-9f2521ca8351e454e03193ddccbf5eb2166ec1fd.tar.gz pfsense-packages-9f2521ca8351e454e03193ddccbf5eb2166ec1fd.tar.bz2 pfsense-packages-9f2521ca8351e454e03193ddccbf5eb2166ec1fd.zip | |
* added copyright header to each file
* added XSL stylesheet to each file
* added DTD to some files (TODO: Add DTD to the remaining files and validate them against the DTD)
* added a Document Type Definition which allows to validate package files
40 files changed, 885 insertions, 738 deletions
diff --git a/packages/arping/arping.xml b/packages/arping/arping.xml index be3e8654..e8619496 100644 --- a/packages/arping/arping.xml +++ b/packages/arping/arping.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<!-- <!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> --> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -48,11 +48,7 @@ <name>arping</name> <version>2.6.0.2</version> <title>Services: arping</title> - <additional_files_needed> - <prefix>/usr/local/pkg/</prefix> - <chmod>077</chmod> - <item>http://www.pfsense.com/packages/config/arping/arping.inc</item> - </additional_files_needed> + <include_file>/usr/local/pkg/arping.inc</include_file> <menu> <name>Arping</name> <tooltiptext>Host to arp ping</tooltiptext> @@ -63,7 +59,6 @@ <name>arping</name> <executable>arping</executable> </service> - <include_file>/usr/local/pkg/arping.inc</include_file> <tabs> <tab> <text>arping Settings</text> @@ -71,6 +66,11 @@ <active/> </tab> </tabs> + <additional_files_needed> + <prefix>/usr/local/pkg/</prefix> + <chmod>077</chmod> + <item>http://www.pfsense.com/packages/config/arping/arping.inc</item> + </additional_files_needed> <fields> <field> <fielddescr>Host IP or Mac</fielddescr> diff --git a/packages/dspam/pkg/p3scan-pf-vir.xml b/packages/dspam/pkg/p3scan-pf-vir.xml index 720b847a..ed68b8cf 100644 --- a/packages/dspam/pkg/p3scan-pf-vir.xml +++ b/packages/dspam/pkg/p3scan-pf-vir.xml @@ -97,12 +97,12 @@ <size>1</size> <default_value>clamd</default_value> <options> - <option><value>avpd</value><name>Kaspersky Anti-Virus for Linux</name></option> - <option><value>avpd_new</value><name>Kaspersky Anti-Virus for Linux (New)</name></option> - <option><value>bash</value><name>Shell Script</name></option> - <option><value>basic</value><name>Default Scanner Type</name></option> - <option><value>clamd</value><name>Clam Anti-Virus</name></option> - <option><value>trophie</value><name>Trophie Daemon</name></option> + <option><name>Kaspersky Anti-Virus for Linux</name><value>avpd</value></option> + <option><name>Kaspersky Anti-Virus for Linux (New)</name><value>avpd_new</value></option> + <option><name>Shell Script</name><value>bash</value></option> + <option><name>Default Scanner Type</name><value>basic</value></option> + <option><name>Clam Anti-Virus</name><value>clamd</value></option> + <option><name>Trophie Daemon</name><value>trophie</value></option> </options> </field> <field> diff --git a/packages/lightsquid/lightsquid.xml b/packages/lightsquid/lightsquid.xml index 6e219702..e5d48e34 100644 --- a/packages/lightsquid/lightsquid.xml +++ b/packages/lightsquid/lightsquid.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -45,9 +46,9 @@ <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> <name>lightsquid</name> + <version>1.7.1_1</version> <title>Services: Proxy server Report(LightSquid) -> Settings</title> <category>Status</category> - <version>1.7.1_1</version> <include_file>/usr/local/pkg/lightsquid.inc</include_file> <!-- Installation --> @@ -57,14 +58,6 @@ <section>Status</section> <url>/pkg_edit.php?xml=lightsquid.xml&id=0</url> </menu> - <additional_files_needed> - <item>http://www.pfsense.com/packages/config/lightsquid/lightsquid.inc</item> - </additional_files_needed> - <additional_files_needed> - <item>http://www.pfsense.com/packages/All/lightsquid_tpl.tbz</item> - <prefix>/var/tmp/</prefix> - <chmod>0755</chmod> - </additional_files_needed> <tabs> <tab> <text>Settings</text> @@ -76,61 +69,69 @@ <url>/lightsquid/index.cgi</url> </tab> </tabs> + <additional_files_needed> + <item>http://www.pfsense.com/packages/config/lightsquid/lightsquid.inc</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/var/tmp/</prefix> + <chmod>0755</chmod> + <item>http://www.pfsense.com/packages/All/lightsquid_tpl.tbz</item> + </additional_files_needed> <fields> <field> - <fieldname>lightsquid_lang</fieldname> <fielddescr>Language</fielddescr> + <fieldname>lightsquid_lang</fieldname> <description>Select report language</description> <type>select</type> <value>eng</value> <options> - <option><value>bg</value><name>Bulgarian</name></option> - <option><value>cz</value><name>Czech</name></option> - <option><value>eng</value><name>English</name></option> - <option><value>fr</value><name>French</name></option> - <option><value>hu</value><name>Hungarian</name></option> - <option><value>it</value><name>Italian</name></option> - <option><value>pt_br</value><name>Portuguese - Brazil</name></option> - <option><value>ru</value><name>Russian</name></option> - <option><value>ru-koi8</value><name>Russian KOI-8</name></option> - <option><value>sp</value><name>Spanish</name></option> - <option><value>ua</value><name>Ukrainian</name></option> + <option><name>Bulgarian</name><value>bg</value></option> + <option><name>Czech</name><value>cz</value></option> + <option><name>English</name><value>eng</value></option> + <option><name>French</name><value>fr</value></option> + <option><name>Hungarian</name><value>hu</value></option> + <option><name>Italian</name><value>it</value></option> + <option><name>Portuguese - Brazil</name><value>pt_br</value></option> + <option><name>Russian</name><value>ru</value></option> + <option><name>Russian KOI-8</name><value>ru-koi8</value></option> + <option><name>Spanish</name><value>sp</value></option> + <option><name>Ukrainian</name><value>ua</value></option> </options> </field> <field> - <fieldname>lightsquid_barcolor</fieldname> <fielddescr>Bar color</fielddescr> + <fieldname>lightsquid_barcolor</fieldname> <description>Select bar color</description> <type>select</type> <value>orange</value> <options> - <option><value>orange</value><name>Orange</name></option> - <option><value>blue</value><name>Blue</name></option> - <option><value>green</value><name>Green</name></option> - <option><value>yellow</value><name>Yellow</name></option> - <option><value>brown</value><name>Brown</name></option> - <option><value>red</value><name>Red</name></option> + <option><name>Orange</name><value>orange</value></option> + <option><name>Blue</name><value>blue</value></option> + <option><name>Green</name><value>green</value></option> + <option><name>Yellow</name><value>yellow</value></option> + <option><name>Brown</name><value>brown</value></option> + <option><name>Red</name><value>red</value></option> </options> </field> <field> - <fieldname>lightsquid_template</fieldname> <fielddescr>Report scheme</fielddescr> + <fieldname>lightsquid_template</fieldname> <description>Select report scheme</description> <type>select</type> <value>base</value> <options> - <option><value>base</value><name>Base</name></option> - <option><value>text</value><name>Text</name></option> - <option><value>novosea</value><name>NovoSea</name></option> - <option><value>novopf</value><name>NovoPf</name></option> + <option><name>Base</name><value>base</value></option> + <option><name>Text</name><value>text</value></option> + <option><name>NovoSea</name><value>novosea</value></option> + <option><name>NovoPf</name><value>novopf</value></option> </options> </field> <field> - <fieldname>lightsquid_ip2name</fieldname> <fielddescr>IP resolve method (future)</fielddescr> + <fieldname>lightsquid_ip2name</fieldname> <description> <table cellpadding=1 cellspacing=0 style="text-align: left;"> <tbody> <tr><th colspan=2> Select IP to Name resolve method (take effect only on new data): </th><tr> @@ -145,18 +146,18 @@ <type>select</type> <value>dns</value> <options> - <option><value>ip</value><name>IP</name></option> - <option><value>demo</value><name>Demo</name></option> - <option><value>dns</value><name>DNS</name></option> - <option><value>simple</value><name>Simple</name></option> - <option><value>smb</value><name>SMB</name></option> - <option><value>squidauth</value><name>Squidauth</name></option> + <option><name>IP</name><value>ip</value></option> + <option><name>Demo</name><value>demo</value></option> + <option><name>DNS</name><value>dns</value></option> + <option><name>Simple</name><value>simple</value></option> + <option><name>SMB</name><value>smb</value></option> + <option><name>Squidauth</name><value>squidauth</value></option> </options> </field> <field> - <fieldname>lightsquid_refreshsheduler_time</fieldname> <fielddescr>Refresh sheduler</fielddescr> + <fieldname>lightsquid_refreshsheduler_time</fieldname> <description> Select data refresh period. System will execute task every XX time as from 00:00 hours. <br> For example: if selected 2h - system wil start task at 0-2-4-..-24h. <br> @@ -171,25 +172,25 @@ <type>select</type> <value>lhp_none</value> <options> - <option><value>lhp_none</value><name>none</name></option> - <option><value>lhp_10m</value><name>10min(!)</name></option> - <option><value>lhp_20m</value><name>20min(!)</name></option> - <option><value>lhp_30m</value><name>30min(*)</name></option> - <option><value>lhp_40m</value><name>40min(*)</name></option> - <option><value>lhp_50m</value><name>50min(+)</name></option> - <option><value>lhp_60m</value><name>60min(+)</name></option> - <option><value>lhp_2h</value><name>2h</name></option> - <option><value>lhp_3h</value><name>3h</name></option> - <option><value>lhp_4h</value><name>4h</name></option> - <option><value>lhp_6h</value><name>6h</name></option> - <option><value>lhp_8h</value><name>8h</name></option> - <option><value>lhp_12h</value><name>12h</name></option> - <option><value>lhp_24h</value><name>24(00)h</name></option> + <option><name>none</name><value>lhp_none</value></option> + <option><name>10min(!)</name><value>lhp_10m</value></option> + <option><name>20min(!)</name><value>lhp_20m</value></option> + <option><name>30min(*)</name><value>lhp_30m</value></option> + <option><name>40min(*)</name><value>lhp_40m</value></option> + <option><name>50min(+)</name><value>lhp_50m</value></option> + <option><name>60min(+)</name><value>lhp_60m</value></option> + <option><name>2h</name><value>lhp_2h</value></option> + <option><name>3h</name><value>lhp_3h</value></option> + <option><name>4h</name><value>lhp_4h</value></option> + <option><name>6h</name><value>lhp_6h</value></option> + <option><name>8h</name><value>lhp_8h</value></option> + <option><name>12h</name><value>lhp_12h</value></option> + <option><name>24(00)h</name><value>lhp_24h</value></option> </options> </field> <field> - <fieldname>lightsquid_squidrotatelog_sheduler_time</fieldname> <fielddescr>Squid rotate log sheduler</fielddescr> + <fieldname>lightsquid_squidrotatelog_sheduler_time</fieldname> <description> Select squid log rotate period. System will execute task every XX time as from 00:00 hours. <br> This option will allow the updating of the faster <br> @@ -201,30 +202,30 @@ <type>select</type> <value>lsr_none</value> <options> - <option><value>lsr_none</value><name>none</name></option> - <option><value>lsr_d1</value><name>every 1 day</name></option> - <option><value>lsr_d2</value><name>every 2 day</name></option> - <option><value>lsr_d3</value><name>every 3 day</name></option> - <option><value>lsr_d4</value><name>every 4 day</name></option> - <option><value>lsr_d5</value><name>every 5 day</name></option> - <option><value>lsr_d6</value><name>every 6 day</name></option> - <option><value>lsr_w1</value><name>weekly at Monday</name></option> - <option><value>lsr_w2</value><name>weekly at Tuesday</name></option> - <option><value>lsr_w3</value><name>weekly at Wednesday</name></option> - <option><value>lsr_w4</value><name>weekly at Thursday</name></option> - <option><value>lsr_w5</value><name>weekly at Friday</name></option> - <option><value>lsr_w6</value><name>weekly at Saturday</name></option> - <option><value>lsr_w7</value><name>weekly at Sunday</name></option> - <option><value>lsr_d10</value><name>every 10 day</name></option> - <option><value>lsr_d15</value><name>every 15 day</name></option> - <option><value>lsr_d20</value><name>every 20 day</name></option> - <option><value>lsr_d25</value><name>every 25 day</name></option> - <option><value>lsr_d30</value><name>every 30 day</name></option> + <option><name>none</name><value>lsr_none</value></option> + <option><name>every 1 day</name><value>lsr_d1</value></option> + <option><name>every 2 day</name><value>lsr_d2</value></option> + <option><name>every 3 day</name><value>lsr_d3</value></option> + <option><name>every 4 day</name><value>lsr_d4</value></option> + <option><name>every 5 day</name><value>lsr_d5</value></option> + <option><name>every 6 day</name><value>lsr_d6</value></option> + <option><name>weekly at Monday</name><value>lsr_w1</value></option> + <option><name>weekly at Tuesday</name><value>lsr_w2</value></option> + <option><name>weekly at Wednesday</name><value>lsr_w3</value></option> + <option><name>weekly at Thursday</name><value>lsr_w4</value></option> + <option><name>weekly at Friday</name><value>lsr_w5</value></option> + <option><name>weekly at Saturday</name><value>lsr_w6</value></option> + <option><name>weekly at Sunday</name><value>lsr_w7</value></option> + <option><name>every 10 day</name><value>lsr_d10</value></option> + <option><name>every 15 day</name><value>lsr_d15</value></option> + <option><name>every 20 day</name><value>lsr_d20</value></option> + <option><name>every 25 day</name><value>lsr_d25</value></option> + <option><name>every 30 day</name><value>lsr_d30</value></option> </options> </field> <field> - <fieldname>lightsquid_skipurl</fieldname> <fielddescr>Skip url</fielddescr> + <fieldname>lightsquid_skipurl</fieldname> <description> If you want skip some sites from stat, example our local www server Example, if you want skip LOCAL site, put it here diff --git a/packages/miniupnpd/miniupnpd.xml b/packages/miniupnpd/miniupnpd.xml index 6ebf7dfc..bbf4977b 100644 --- a/packages/miniupnpd/miniupnpd.xml +++ b/packages/miniupnpd/miniupnpd.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -44,33 +45,18 @@ <description>Describe your package here</description> <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> - <title>Services: MiniUPnPd</title> <name>miniupnpd</name> <version>20070521</version> + <title>Services: MiniUPnPd</title> <savetext>Change</savetext> - <include_file>/usr/local/pkg/miniupnpd.inc</include_file> <aftersaveredirect>/status_upnp.php</aftersaveredirect> + <include_file>/usr/local/pkg/miniupnpd.inc</include_file> <menu> <name>MiniUPnPd</name> <tooltiptext>Set miniupnpd settings such as interfaces to listen on.</tooltiptext> <section>Services</section> <url>/status_upnp.php</url> </menu> - <additional_files_needed> - <item>http://www.pfsense.org/packages/config/miniupnpd/miniupnpd.inc</item> - <prefix>/usr/local/pkg/</prefix> - <chmod>0755</chmod> - </additional_files_needed> - <additional_files_needed> - <item>http://www.pfsense.org/packages/config/miniupnpd/status_upnp.php</item> - <prefix>/usr/local/www/</prefix> - <chmod>0755</chmod> - </additional_files_needed> - <additional_files_needed> - <prefix>/usr/local/sbin/</prefix> - <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/miniupnpd/sbin/miniupnpd</item> - </additional_files_needed> <service> <name>miniupnpd</name> <rcfile>miniupnpd.sh</rcfile> @@ -87,6 +73,21 @@ <active/> </tab> </tabs> + <additional_files_needed> + <prefix>/usr/local/pkg/</prefix> + <chmod>0755</chmod> + <item>http://www.pfsense.org/packages/config/miniupnpd/miniupnpd.inc</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/</prefix> + <chmod>0755</chmod> + <item>http://www.pfsense.org/packages/config/miniupnpd/status_upnp.php</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/sbin/</prefix> + <chmod>0755</chmod> + <item>http://www.pfsense.com/packages/config/miniupnpd/sbin/miniupnpd</item> + </additional_files_needed> <fields> <field> <fielddescr>Enable MiniUPnPd</fielddescr> @@ -96,12 +97,12 @@ <field> <fielddescr>Interfaces (generally LAN)</fielddescr> <fieldname>iface_array</fieldname> - <value>lan</value> - <multiple>true</multiple> - <size>3</size> - <type>interfaces_selection</type> <description>You can use the CTRL or COMMAND key to select multiple interfaces.</description> + <type>interfaces_selection</type> + <size>3</size> <required/> + <value>lan</value> + <multiple>true</multiple> </field> <field> <fielddescr>Maximum Download Speed (Kbits/second)</fielddescr> diff --git a/packages/nmap/nmap.xml b/packages/nmap/nmap.xml index d242a7be..d2fa42ee 100644 --- a/packages/nmap/nmap.xml +++ b/packages/nmap/nmap.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -47,9 +48,10 @@ <name>nmap</name> <version>4.11</version> <title>Diagnostics: NMap</title> - <donotsave>true</donotsave> - <preoutput>yes</preoutput> <savetext>Scan</savetext> + <preoutput>yes</preoutput> + <donotsave>true</donotsave> + <include_file>/usr/local/pkg/nmap.inc</include_file> <!-- Menu is where this packages menu will appear --> <menu> <name>NMap</name> @@ -80,34 +82,33 @@ <option><name>Ping</name><value>icmp</value></option> <option><name>UDP</name><value>udp</value></option> </options> - <typehint>Scan method</typehint> + <typehint>Scan method</typehint> </field> <field> <fielddescr>-P0</fielddescr> - <typehint>Do not try to ping hosts at all before scanning them.</typehint> <fieldname>noping</fieldname> <description>This allows the scanning of networks that don't allow ICMP echo requests (or responses) through their firewall. microsoft.com is an example of such a network, and thus you should always use -P0 or -PT80 when port scanning microsoft.com. Note the "ping" in this contecx may involve more than the traditional ICMP echo request packet. Nmap supports many such probes, including arbitrary combinations of TCP, UDP, and ICMP probes. By default, Nmap sends an ICMP echo request and a TCP ACK packet to port 80.</description> <type>checkbox</type> + <typehint>Do not try to ping hosts at all before scanning them.</typehint> </field> <field> <fielddescr>-sV</fielddescr> - <typehint>Try to identify service versions</typehint> <fieldname>servicever</fieldname> <description>After TCP and/or UDP ports are discovered using one of the other scan methods, version detection communicates with those ports to try and determine more about what is actually running. A file called nmap-service-probes is used to determine the best probes for detecting various services and the match strings to expect. Nmap tries to determine the service protocol (e.g. ftp, ssh, telnet, http), the application name (e.g. ISC Bind, Apache httpd, Solaris telnetd), the version number, and sometimes miscellaneous details like whether an X server is open to connections or the SSH protocol version)</description> <type>checkbox</type> + <typehint>Try to identify service versions</typehint> </field> <field> <fielddescr>-O</fielddescr> - <typehint>Turn on OS detection</typehint> <fieldname>osdetect</fieldname> <description>This option activates remote host identification via TCP/IP fingerprinting. In other words, it uses a bunch of techniques to detect subtleties in the underlying operating system network stack of the computers you are scanning. It uses this information to create a "fingerprint" which it compares with its database of known OS fingerprints (the nmap-os-fingerprints file) to decide what type of system you are scanning</description> <type>checkbox</type> + <typehint>Turn on OS detection</typehint> </field> </fields> - <include_file>/usr/local/pkg/nmap.inc</include_file> - <custom_php_deinstall_command> - </custom_php_deinstall_command> <custom_add_php_command> nmap_custom_add_php_command(); </custom_add_php_command> + <custom_php_deinstall_command> + </custom_php_deinstall_command> </packagegui> diff --git a/packages/nut/nut.xml b/packages/nut/nut.xml index d2f4e97e..d878a3c2 100644 --- a/packages/nut/nut.xml +++ b/packages/nut/nut.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -44,28 +45,18 @@ <description>Describe your package here</description> <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> - <title>Services: NUT</title> <name>nut</name> <version>2.0.5</version> + <title>Services: NUT</title> <savetext>Change</savetext> - <include_file>/usr/local/pkg/nut.inc</include_file> <aftersaveredirect>/status_nut.php</aftersaveredirect> + <include_file>/usr/local/pkg/nut.inc</include_file> <menu> <name>NUT</name> <tooltiptext>Set Network UPS Tools settings.</tooltiptext> <section>Services</section> <url>/status_nut.php</url> </menu> - <additional_files_needed> - <item>http://www.pfsense.com/packages/config/nut/nut.inc</item> - <prefix>/usr/local/pkg/</prefix> - <chmod>0755</chmod> - </additional_files_needed> - <additional_files_needed> - <item>http://www.pfsense.com/packages/config/nut/status_nut.php</item> - <prefix>/usr/local/www/</prefix> - <chmod>0755</chmod> - </additional_files_needed> <service> <name>nut</name> <rcfile>nut.sh</rcfile> @@ -82,6 +73,16 @@ <active/> </tab> </tabs> + <additional_files_needed> + <prefix>/usr/local/pkg/</prefix> + <chmod>0755</chmod> + <item>http://www.pfsense.com/packages/config/nut/nut.inc</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/</prefix> + <chmod>0755</chmod> + <item>http://www.pfsense.com/packages/config/nut/status_nut.php</item> + </additional_files_needed> <fields> <field> <fielddescr>UPS Monitoring</fielddescr> @@ -111,9 +112,9 @@ <field> <fielddescr><strong>Local UPS Model</strong></fielddescr> <fieldname>driver</fieldname> - <type>select</type> <description>If generic or cable specified in parenthesis you need to select the appropriate option below.</description> + <type>select</type> <options> <option> <name>APC Back-UPS (Generic)</name> @@ -414,36 +415,36 @@ <type>select</type> <options> <option> - <value></value> <name></name> + <value></value> </option> <option> - <value>1 00</value> <name>1 (APC Back-UPS using 940-0095A/C cables)</name> + <value>1 00</value> </option> <option> - <value>2 00</value> <name>2 (APC Back-UPS using 940-0020B/C cables)</name> + <value>2 00</value> </option> <option> - <value>9 00</value> <name>9 (APC Back-UPS using 940-0023A cable)</name> + <value>9 00</value> </option> <option> - <value>12 00</value> <name>12 (APC Back-UPS Office using 940-0119A cable)</name> + <value>12 00</value> </option> <option> - <value>12 01</value> <name>12 (APC Masterswitch using 940-0020 cable)</name> + <value>12 01</value> </option> <option> - <value>20 00</value> <name>20 (APC Back-UPS RS)</name> + <value>20 00</value> </option> <option> - <value>6 00</value> <name>6 (Best Power Patriot using INT51 cable)</name> + <value>6 00</value> </option> </options> </field> @@ -453,16 +454,16 @@ <type>select</type> <options> <option> - <value></value> <name></name> + <value></value> </option> <option> - <value>940-0095B 00</value> <name>940-0095B (Gray Cable)</name> + <value>940-0095B 00</value> </option> <option> - <value>940-0024C 00</value> <name>940-0024C (Black Cable)</name> + <value>940-0024C 00</value> </option> </options> </field> diff --git a/packages/p3scan-pf/p3scan-pf-emer.xml b/packages/p3scan-pf/p3scan-pf-emer.xml index 12a78e09..da39aef8 100644 --- a/packages/p3scan-pf/p3scan-pf-emer.xml +++ b/packages/p3scan-pf/p3scan-pf-emer.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> diff --git a/packages/p3scan-pf/p3scan-pf-msg.xml b/packages/p3scan-pf/p3scan-pf-msg.xml index 00c29acf..d3f81aa2 100644 --- a/packages/p3scan-pf/p3scan-pf-msg.xml +++ b/packages/p3scan-pf/p3scan-pf-msg.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -53,8 +54,8 @@ set, you are still required to save this page if you are editing this page for the very first time! </note> - <include_file>p3scan-pf.inc</include_file> <aftersaveredirect>pkg_edit.php?xml=p3scan-pf-msg.xml&id=0</aftersaveredirect> + <include_file>p3scan-pf.inc</include_file> <tabs> <tab> <text>Daemon Settings</text> @@ -107,8 +108,8 @@ <fieldname>bytesfree</fieldname> <description>The number of KB's there must be free before processing any mail.</description> <type>input</type> - <default_value>10000</default_value> <required /> + <default_value>10000</default_value> </field> <field> <fielddescr>Broken Email Clients</fielddescr> @@ -139,8 +140,8 @@ </description> <type>input</type> <size>60</size> - <default_value>Subject: "[Virus] found in a mail to you:" <virus name></default_value> <required /> + <default_value>Subject: "[Virus] found in a mail to you:" <virus name></default_value> </field> <field> <fielddescr>Notify</fielddescr> @@ -152,8 +153,8 @@ </description> <type>input</type> <size>60</size> - <default_value>Per instruction, the message has been deleted.</default_value> <required /> + <default_value>Per instruction, the message has been deleted.</default_value> </field> <field> <fielddescr>SMTP Reject</fielddescr> @@ -165,8 +166,8 @@ </description> <type>input</type> <size>60</size> - <default_value>Virus detected! P3scan rejected message!</default_value> <required /> + <default_value>Virus detected! P3scan rejected message!</default_value> </field> <field> <fielddescr>Check SMTP size</fielddescr> diff --git a/packages/p3scan-pf/p3scan-pf-spam.xml b/packages/p3scan-pf/p3scan-pf-spam.xml index 60de13e6..86301a50 100644 --- a/packages/p3scan-pf/p3scan-pf-spam.xml +++ b/packages/p3scan-pf/p3scan-pf-spam.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -53,8 +54,8 @@ set, you are still required to save this page if you are editing this page for the very first time! </note> - <include_file>p3scan-pf.inc</include_file> <aftersaveredirect>pkg_edit.php?xml=p3scan-pf-spam.xml&id=0</aftersaveredirect> + <include_file>p3scan-pf.inc</include_file> <tabs> <tab> <text>Daemon Settings</text> diff --git a/packages/p3scan-pf/p3scan-pf-transex.xml b/packages/p3scan-pf/p3scan-pf-transex.xml index 343529cb..e1b2070a 100644 --- a/packages/p3scan-pf/p3scan-pf-transex.xml +++ b/packages/p3scan-pf/p3scan-pf-transex.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> diff --git a/packages/p3scan-pf/p3scan-pf-vir.xml b/packages/p3scan-pf/p3scan-pf-vir.xml index 8a04c6e1..d96e8a87 100644 --- a/packages/p3scan-pf/p3scan-pf-vir.xml +++ b/packages/p3scan-pf/p3scan-pf-vir.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -53,8 +54,8 @@ set, you are still required to save this page if you are editing this page for the very first time! </note> - <include_file>p3scan-pf.inc</include_file> <aftersaveredirect>pkg_edit.php?xml=p3scan-pf-vir.xml&id=0</aftersaveredirect> + <include_file>p3scan-pf.inc</include_file> <tabs> <tab> <text>Daemon Settings</text> @@ -97,15 +98,15 @@ <fieldname>scannertype</fieldname> <description>Select here which type of scanner you want to use.</description> <type>select</type> - <default_value>clamd</default_value> <size>1</size> + <default_value>clamd</default_value> <options> - <option><value>avpd</value><name>Kaspersky Anti-Virus for Linux</name></option> - <option><value>avpd_new</value><name>Kaspersky Anti-Virus for Linux (New)</name></option> - <option><value>bash</value><name>Shell Script</name></option> - <option><value>basic</value><name>Default Scanner Type</name></option> - <option><value>clamd</value><name>Clam Anti-Virus</name></option> - <option><value>trophie</value><name>Trophie Daemon</name></option> + <option><name>Kaspersky Anti-Virus for Linux</name><value>avpd</value></option> + <option><name>Kaspersky Anti-Virus for Linux (New)</name><value>avpd_new</value></option> + <option><name>Shell Script</name><value>bash</value></option> + <option><name>Default Scanner Type</name><value>basic</value></option> + <option><name>Clam Anti-Virus</name><value>clamd</value></option> + <option><name>Trophie Daemon</name><value>trophie</value></option> </options> </field> <field> @@ -113,8 +114,8 @@ <fieldname>scanner</fieldname> <description>Depends on scannertype.</description> <type>input</type> - <default_value>127.0.0.1:3310</default_value> <required /> + <default_value>127.0.0.1:3310</default_value> </field> <field> <fielddescr>Scanner Returncode</fielddescr> diff --git a/packages/p3scan-pf/p3scan-pf.xml b/packages/p3scan-pf/p3scan-pf.xml index 4594aaec..f309cb50 100644 --- a/packages/p3scan-pf/p3scan-pf.xml +++ b/packages/p3scan-pf/p3scan-pf.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -52,15 +53,15 @@ set, you are still required to save this page if you are editing this page for the very first time! </note> - <include_file>p3scan-pf.inc</include_file> <aftersaveredirect>pkg_edit.php?xml=p3scan-pf.xml&id=0</aftersaveredirect> + <include_file>p3scan-pf.inc</include_file> <!-- Menu is where this packages menu will appear --> <menu> <name>POP3 Proxy</name> + <tooltiptext>A transparent POP3-Proxy with virus-scanning capabilities</tooltiptext> <section>Services</section> <configfile>p3scan-pf.xml</configfile> <url>/pkg_edit.php?xml=p3scan-pf.xml&id=0</url> - <tooltiptext>A transparent POP3-Proxy with virus-scanning capabilities</tooltiptext> </menu> <service> <name>p3scan-pf</name> @@ -147,56 +148,56 @@ <fieldname>ipaddr</fieldname> <description>The <acronym title="Internet Protocol">IP</acronym> Address we listen on.</description> <type>input</type> - <default_value>127.0.0.1</default_value> <required /> + <default_value>127.0.0.1</default_value> </field> <field> <fielddescr>Port</fielddescr> <fieldname>port</fieldname> <description>The <acronym title="Transmission Control Protocol">TCP</acronym> port on we should listen.</description> <type>input</type> - <default_value>8110</default_value> <required /> + <default_value>8110</default_value> </field> <field> <fielddescr>SSL Port</fielddescr> <fieldname>sslport</fieldname> <description>The TCP <acronym title="Secure Sockets Layer">SSL</acronym> port on we should listen.</description> <type>input</type> - <default_value>995</default_value> <required /> + <default_value>995</default_value> </field> <field> <fielddescr>Target IP</fielddescr> <fieldname>targetip</fieldname> <description>Target IP is the IP to connect (0.0.0.0 enables transparent mode).</description> <type>input</type> - <default_value>0.0.0.0</default_value> <required /> + <default_value>0.0.0.0</default_value> </field> <field> <fielddescr>Target Port</fielddescr> <fieldname>targetport</fieldname> <description>Target Port is the port to connect.</description> - <default_value>8110</default_value> <type>input</type> <required /> + <default_value>8110</default_value> </field> <field> <fielddescr>Email Port</fielddescr> <fieldname>emailport</fieldname> <description>The port we should listen on to scan outgoing email messages.</description> <type>input</type> - <default_value>25</default_value> <required /> + <default_value>25</default_value> </field> <field> <fielddescr>Daemon User</fielddescr> <fieldname>daemonuser</fieldname> <description>The username the daemon should run as.</description> <type>input</type> - <default_value>root</default_value> <required /> + <default_value>root</default_value> </field> </fields> <!-- diff --git a/packages/phpsysinfo/phpsysinfo.xml b/packages/phpsysinfo/phpsysinfo.xml index 09166e6e..f2d6bb06 100644 --- a/packages/phpsysinfo/phpsysinfo.xml +++ b/packages/phpsysinfo/phpsysinfo.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="./xsl/package.xsl"?> <packagegui> <copyright> @@ -47,6 +48,8 @@ <name>phpsysinfo</name> <version>1.0</version> <title>phpsysinfo</title> + <aftersaveredirect>/pkg_edit.php?xml=phpsysinfo.xml&id=0</aftersaveredirect> + <include_file>/usr/local/pkg/phpsysinfo.inc</include_file> <menu> <name>phpsysinfo</name> <tooltiptext></tooltiptext> @@ -64,7 +67,6 @@ <url>/phpSysInfo</url> </tab> </tabs> - <aftersaveredirect>/pkg_edit.php?xml=phpsysinfo.xml&id=0</aftersaveredirect> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> <chmod>0644</chmod> @@ -75,46 +77,45 @@ <chmod>0644</chmod> <item>http://www.pfsense.com/packages/All/phpsysinfo-2.5.3.tgz</item> </additional_files_needed> - <custom_php_install_command>phpsysinfo_install_config();</custom_php_install_command> - <custom_php_deinstall_command>phpsysinfo_install_deinstall();</custom_php_deinstall_command> - <custom_php_resync_config_command>phpsysinfo_install_config();</custom_php_resync_config_command> - <include_file>/usr/local/pkg/phpsysinfo.inc</include_file> <fields> <field> - <fieldname>hidepicklist</fieldname> <fielddescr>Hide picklist</fielddescr> + <fieldname>hidepicklist</fieldname> <description>Hide language and template picklist</description> <type>checkbox</type> </field> <field> - <fieldname>sensorprogram</fieldname> <fielddescr>Show mbmon</fielddescr> + <fieldname>sensorprogram</fieldname> <description>Define the motherboard monitoring program here. Note that not all motherboards are supported and some only partly.</description> <type>checkbox</type> </field> <field> - <fieldname>showmountpoint</fieldname> <fielddescr>Show mount point</fielddescr> + <fieldname>showmountpoint</fieldname> <description>Show mount point</description> <type>checkbox</type> </field> <field> - <fieldname>showinodes</fieldname> <fielddescr>Show inodes</fielddescr> + <fieldname>showinodes</fieldname> <description>Show inode usage</description> <type>checkbox</type> </field> <field> - <fieldname>loadbar</fieldname> <fielddescr>Show loadbar</fielddescr> + <fieldname>loadbar</fieldname> <description>Show a graph for current cpuload</description> <type>checkbox</type> </field> <field> - <fieldname>showerrors</fieldname> <fielddescr>Show errors</fielddescr> + <fieldname>showerrors</fieldname> <description>Display error messages at the top of the page. Note that vmstat is added in 1.0.1-SNAPSHOT-03-15-2007 and later</description> <type>checkbox</type> </field> </fields> + <custom_php_resync_config_command>phpsysinfo_install_config();</custom_php_resync_config_command> + <custom_php_install_command>phpsysinfo_install_config();</custom_php_install_command> + <custom_php_deinstall_command>phpsysinfo_install_deinstall();</custom_php_deinstall_command> </packagegui> diff --git a/packages/quagga/quagga.xml b/packages/quagga/quagga.xml index 2dbbcc60..4f4b65dc 100644 --- a/packages/quagga/quagga.xml +++ b/packages/quagga/quagga.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -44,16 +45,19 @@ <description>Describe your package here</description> <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> + <name>none</name> + <version>none</version> + <title>none</title> <service> <name>quagga</name> - <description></description> <rcfile>quagga.sh</rcfile> <executable>quagga</executable> + <description></description> </service> <additional_files_needed> - <item>http://www.pfsense.org/packages/config/quagga/quagga.sh</item> <prefix>/usr/local/etc/rc.d/</prefix> <chmod>0777</chmod> + <item>http://www.pfsense.org/packages/config/quagga/quagga.sh</item> </additional_files_needed> <custom_php_install_command> mwexec("/usr/local/etc/rc.d/quagga.sh start"); diff --git a/packages/routed/routed.xml b/packages/routed/routed.xml index 1b16a3ce..d7767a5b 100644 --- a/packages/routed/routed.xml +++ b/packages/routed/routed.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -47,12 +48,8 @@ <name>routed</name> <version>1.1</version> <title>Services: RIP</title> + <aftersaveredirect>pkg_edit.php?xml=routed.xml&id=0</aftersaveredirect> <include_file>routed.inc</include_file> - - <additional_files_needed> - <item>http://www.pfsense.org/packages/config/routed/routed.inc</item> - </additional_files_needed> - <!-- Menu is where this packages menu will appear --> <menu> <name>RIP</name> @@ -70,6 +67,9 @@ <!-- configpath gets expanded out automatically and config items will be stored in that location --> <configpath>['installedpackages']['routed']['config']</configpath> + <additional_files_needed> + <item>http://www.pfsense.org/packages/config/routed/routed.inc</item> + </additional_files_needed> <!-- fields gets invoked when the user adds or edits a item. the following items will be parsed and rendered for the user as a gui with input, and selectboxes. --> <fields> @@ -83,24 +83,24 @@ <field> <fielddescr>Interfaces</fielddescr> <fieldname>iface_array</fieldname> + <description>Select the interfaces that RIP will bind to. You can use the CTRL or COMMAND key to select multiple interfaces.</description> + <type>interfaces_selection</type> + <size>3</size> + <required /> <value>lan</value> <multiple>true</multiple> - <size>3</size> - <type>interfaces_selection</type> - <description>Select the interfaces that RIP will bind to. You can use the CTRL or COMMAND key to select multiple interfaces.</description> - <required /> </field> <field> <fielddescr>RIP Version</fielddescr> <fieldname>ripversion</fieldname> <type>select</type> + <required /> <default_value>2</default_value> <options> <option><name>RIP Version 1</name><value>1</value></option> <option><name>RIP Version 2</name><value>2</value></option> </options> <typehint>Select which RIP version the daemon will listen/advertise using.</typehint> - <required /> </field> <field> <fielddescr>RIPv2 password</fielddescr> @@ -111,7 +111,6 @@ <type>input</type> </field> </fields> - <aftersaveredirect>pkg_edit.php?xml=routed.xml&id=0</aftersaveredirect> <custom_php_command_before_form> </custom_php_command_before_form> <custom_delete_php_command> diff --git a/packages/schema/packages.dtd b/packages/schema/packages.dtd index e685c609..3f42b948 100644 --- a/packages/schema/packages.dtd +++ b/packages/schema/packages.dtd @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- ...................................................................... --> +<!-- pfSense Package DTD V1.0 ............................................. --> +<!-- File package.dtd ..................................................... --> <!-- /* $Id$ */ /* ========================================================================== */ @@ -37,60 +40,155 @@ */ /* ========================================================================== */ --> +<!-- + | + | May be parsed using http://dtdparse.sourceforge.net/ to generate an + | HTML document that describes this DTD. + | +--> +<!-- Indicates the version of a package --> <!ELEMENT version (#PCDATA)> +<!-- Indicates where to get more informations about this package --> <!ELEMENT url (#PCDATA)> +<!-- needs to be documented --> <!ELEMENT tooltiptext (#PCDATA)> +<!-- The title of a particular package --> <!ELEMENT title (#PCDATA)> +<!-- Categroy of a particular package (e.g. System) --> +<!ELEMENT category (#PCDATA)> +<!-- needs to be documented --> <!ELEMENT note (#PCDATA)> +<!-- needs to be documented --> <!ELEMENT savetext (#PCDATA)> +<!-- needs to be documented --> +<!ELEMENT preoutput (#PCDATA)> +<!-- needs to be documented --> +<!ELEMENT donotsave (#PCDATA)> +<!-- needs to be documented --> <!ELEMENT text (#PCDATA)> +<!-- Container element. Contains several tab elements --> <!ELEMENT tabs ((tab*))> +<!-- A specific tab that is part of a tab pane --> <!ELEMENT tab ((text, url, active?))> -<!ELEMENT service ((name, rcfile, executable?))> +<!-- A service that may be executed while starting the system --> +<!ELEMENT service ((name, rcfile?, executable?, description?))> +<!-- needs to be documented --> <!ELEMENT section (#PCDATA)> +<!-- Indicates what particular kind of components may be required to run this package --> <!ELEMENT requirements (#PCDATA)> +<!-- Shell script that is beeing used to start and stop a service --> <!ELEMENT rcfile (#PCDATA)> +<!-- Executable that represents a service --> <!ELEMENT executable (#PCDATA)> +<!-- needs to be documented --> <!ELEMENT prefix (#PCDATA)> -<!ELEMENT packagegui ((copyright, description, requirements, faq, name, version, title, note?, savetext?, aftersaveredirect?, include_file?, menu*, service?, tabs?, configpath?, adddeleteeditpagefields?, additional_files_needed*, fields?, custom_php_global_functions?, custom_php_command_before_form?, custom_delete_php_command?, custom_add_php_command?, custom_php_resync_config_command?, custom_php_validation_command?, custom_add_php_command_late?, start_command?, restart_command?, custom_php_after_form_command?, custom_php_resync_config_command?, custom_php_install_command?, custom_php_deinstall_command?))> +<!-- Root node of a package definition. Container element --> +<!ELEMENT packagegui ((copyright, description, requirements, faq, name, version, title, category?, note?, savetext?, preoutput?, donotsave?, aftersaveredirect?, include_file?, delete_string?, addedit_string?, menu*, service?, tabs?, configpath?, adddeleteeditpagefields?, additional_files_needed*, fields?, custom_php_global_functions?, custom_php_command_before_form?, custom_delete_php_command?, custom_add_php_command?, custom_php_resync_config_command?, custom_php_validation_command?, custom_add_php_command_late?, start_command?, restart_command?, custom_php_after_form_command?, custom_php_resync_config_command?, custom_php_install_command?, custom_php_deinstall_command?, custom_php_before_form_command?, custom_php_after_head_command?))> +<!-- A particular name --> <!ELEMENT name (#PCDATA)> +<!-- Menu item. Container element --> <!ELEMENT menu ((name, tooltiptext?, section?, configfile?, url?))> +<!-- needs to be documented --> <!ELEMENT item (#PCDATA)> +<!-- A PHP file that needs to be included prior to executing arbitrary PHP code --> <!ELEMENT include_file (#PCDATA)> +<!-- needs to be documented --> +<!ELEMENT delete_string (#PCDATA)> +<!-- needs to be documented --> +<!ELEMENT addedit_string (#PCDATA)> +<!-- needs to be documented --> <!ELEMENT aftersaveredirect (#PCDATA)> +<!-- FAQ items or an URL that points to certain FAQ items --> <!ELEMENT faq (#PCDATA)> +<!-- needs to be documented --> +<!ELEMENT rowhelperfield ((fielddescr, fieldname, description, type, size?))> +<!-- needs to be documented --> +<!ELEMENT rowhelper ((rowhelperfield+))> +<!-- needs to be documented --> <!ELEMENT size (#PCDATA)> +<!-- needs to be documented --> <!ELEMENT donotdisable (#PCDATA)> +<!-- needs to be documented --> <!ELEMENT enablefields (#PCDATA)> +<!-- needs to be documented --> <!ELEMENT required EMPTY> +<!-- needs to be documented --> <!ELEMENT multiple (#PCDATA)> +<!-- needs to be documented --> <!ELEMENT default_value (#PCDATA)> +<!-- needs to be documented --> <!ELEMENT value (#PCDATA)> +<!-- needs to be documented --> <!ELEMENT type (#PCDATA)> +<!-- needs to be documented --> +<!ELEMENT cols (#PCDATA)> +<!-- needs to be documented --> +<!ELEMENT rows (#PCDATA)> +<!-- needs to be documented --> +<!ELEMENT combinefieldsend (#PCDATA)> +<!-- needs to be documented --> +<!ELEMENT onchange (#PCDATA)> +<!-- needs to be documented --> +<!ELEMENT encoding (#PCDATA)> +<!-- needs to be documented --> +<!ELEMENT typehint (#PCDATA)> +<!-- needs to be documented --> <!ELEMENT options ((option+))> +<!-- needs to be documented --> <!ELEMENT option ((name, value))> -<!ELEMENT fields ((field+))> +<!-- needs to be documented --> +<!ELEMENT fields ((field*))> +<!-- needs to be documented --> <!ELEMENT fieldname (#PCDATA)> +<!-- needs to be documented --> <!ELEMENT fielddescr (#PCDATA)> -<!ELEMENT field ((fielddescr, fieldname, description?, type, donotdisable?, enablefields?, size?, required?, default_value?, value?, multiple?, options?))> +<!-- needs to be documented --> +<!ELEMENT field ((fielddescr, fieldname, description?, type, donotdisable?, enablefields?, size?, required?, default_value?, value?, multiple?, options?, cols?, rows?, typehint?, onchange?, encoding?, combinefieldsend?, rowhelper?))> +<!-- needs to be documented --> <!ELEMENT description (#PCDATA)> +<!-- needs to be documented --> <!ELEMENT custom_php_global_functions (#PCDATA)> +<!-- needs to be documented --> <!ELEMENT custom_php_command_before_form (#PCDATA)> +<!-- needs to be documented --> <!ELEMENT custom_delete_php_command (#PCDATA)> +<!-- needs to be documented --> <!ELEMENT custom_add_php_command (#PCDATA)> +<!-- needs to be documented --> <!ELEMENT custom_php_resync_config_command (#PCDATA)> +<!-- needs to be documented --> <!ELEMENT custom_php_validation_command (#PCDATA)> +<!-- needs to be documented --> <!ELEMENT custom_add_php_command_late (#PCDATA)> +<!-- needs to be documented --> <!ELEMENT start_command (#PCDATA)> +<!-- needs to be documented --> <!ELEMENT restart_command (#PCDATA)> +<!-- needs to be documented --> <!ELEMENT custom_php_after_form_command (#PCDATA)> +<!-- needs to be documented --> <!ELEMENT custom_php_install_command (#PCDATA)> +<!-- needs to be documented --> <!ELEMENT custom_php_deinstall_command (#PCDATA)> +<!-- needs to be documented --> +<!ELEMENT custom_php_after_head_command (#PCDATA)> +<!-- needs to be documented --> +<!ELEMENT custom_php_before_form_command (#PCDATA)> +<!-- needs to be documented --> <!ELEMENT copyright (#PCDATA)> +<!-- needs to be documented --> <!ELEMENT configpath (#PCDATA)> +<!-- needs to be documented --> <!ELEMENT configfile (#PCDATA)> +<!-- needs to be documented --> <!ELEMENT chmod (#PCDATA)> +<!-- needs to be documented --> <!ELEMENT columnitem ((fielddescr, fieldname))> +<!-- needs to be documented --> <!ELEMENT adddeleteeditpagefields ((columnitem+))> -<!ELEMENT additional_files_needed ((prefix, chmod, item))> +<!-- needs to be documented --> +<!ELEMENT additional_files_needed ((prefix?, chmod?, item))> +<!-- needs to be documented --> <!ELEMENT active EMPTY> +<!-- End of pfSense package DTD V1.0 ...................................... --> +<!-- ...................................................................... --> diff --git a/packages/snort/snort.xml b/packages/snort/snort.xml index e020b41d..c3846201 100644 --- a/packages/snort/snort.xml +++ b/packages/snort/snort.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -44,15 +45,56 @@ <description>Describe your package here</description> <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> - <title>Services: Snort</title> <name>Snort</name> <version>2.6.0.2</version> + <title>Services: Snort</title> + <include_file>/usr/local/pkg/snort.inc</include_file> <menu> <name>Snort</name> <tooltiptext>Setup snort specific settings</tooltiptext> <section>Services</section> <url>/pkg_edit.php?xml=snort.xml&id=0</url> </menu> + <service> + <name>snort</name> + <rcfile>snort.sh</rcfile> + <executable>snort</executable> + </service> + <tabs> + <tab> + <text>Settings</text> + <url>/pkg_edit.php?xml=snort.xml&id=0</url> + <active/> + </tab> + <tab> + <text>Update Rules</text> + <url>/snort_download_rules.php</url> + </tab> + <tab> + <text>Categories</text> + <url>/snort_rulesets.php</url> + </tab> + <tab> + <text>Rules</text> + <url>/snort_rules.php</url> + </tab> + <tab> + <text>Blocked</text> + <url>/snort_blocked.php</url> + </tab> + <tab> + <text>Whitelist</text> + <url>/pkg.php?xml=snort_whitelist.xml</url> + </tab> + <tab> + <text>Alerts</text> + <url>/snort_alerts.php</url> + </tab> + <tab> + <text>Advanced</text> + <url>/pkg_edit.php?xml=snort_advanced.xml&id=0</url> + </tab> + </tabs> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> <chmod>077</chmod> @@ -118,56 +160,15 @@ <chmod>077</chmod> <item>http://www.pfsense.com/packages/config/snort/snort_advanced.xml</item> </additional_files_needed> - <service> - <name>snort</name> - <rcfile>snort.sh</rcfile> - <executable>snort</executable> - </service> - <include_file>/usr/local/pkg/snort.inc</include_file> - <tabs> - <tab> - <text>Settings</text> - <url>/pkg_edit.php?xml=snort.xml&id=0</url> - <active/> - </tab> - <tab> - <text>Update Rules</text> - <url>/snort_download_rules.php</url> - </tab> - <tab> - <text>Categories</text> - <url>/snort_rulesets.php</url> - </tab> - <tab> - <text>Rules</text> - <url>/snort_rules.php</url> - </tab> - <tab> - <text>Blocked</text> - <url>/snort_blocked.php</url> - </tab> - <tab> - <text>Whitelist</text> - <url>/pkg.php?xml=snort_whitelist.xml</url> - </tab> - <tab> - <text>Alerts</text> - <url>/snort_alerts.php</url> - </tab> - <tab> - <text>Advanced</text> - <url>/pkg_edit.php?xml=snort_advanced.xml&id=0</url> - </tab> - </tabs> <fields> <field> <fielddescr>Interface</fielddescr> <fieldname>iface_array</fieldname> <description>Select all WAN type interfaces</description> + <type>interfaces_selection</type> + <size>3</size> <value>lan</value> <multiple>true</multiple> - <size>3</size> - <type>interfaces_selection</type> </field> <field> <fielddescr>Performance</fielddescr> @@ -176,32 +177,32 @@ <type>select</type> <options> <option> - <value>lowmem</value> <name>lowmem</name> + <value>lowmem</value> </option> <option> - <value>ac-std</value> <name>ac-std</name> + <value>ac-std</value> </option> <option> - <value>ac</value> <name>ac</name> + <value>ac</value> </option> <option> - <value>ac-banded</value> <name>ac-banded</name> + <value>ac-banded</value> </option> <option> - <value>ac-sparsebands</value> <name>ac-sparsebands</name> + <value>ac-sparsebands</value> </option> <option> - <value>mwm</value> <name>mwm</name> + <value>mwm</value> </option> <option> - <value>acs</value> <name>acs</name> + <value>acs</value> </option> </options> </field> @@ -209,9 +210,9 @@ <fielddescr>Oinkmaster code</fielddescr> <fieldname>oinkmastercode</fieldname> <description>Obtain a snort.org Oinkmaster code and paste here.</description> - <value></value> <type>input</type> <size>60</size> + <value></value> </field> <field> <fielddescr>Snort.org subscriber</fielddescr> @@ -258,15 +259,15 @@ <type>checkbox</type> </field> </fields> - <custom_php_install_command> - sync_package_snort_reinstall(); - </custom_php_install_command> <custom_add_php_command> sync_package_snort(); </custom_add_php_command> - <custom_php_resync_command> + <custom_php_resync_config_command> sync_package_snort(); - </custom_php_resync_command> + </custom_php_resync_config_command> + <custom_php_install_command> + sync_package_snort_reinstall(); + </custom_php_install_command> <custom_php_deinstall_command> snort_deinstall(); </custom_php_deinstall_command> diff --git a/packages/snort/snort_advanced.xml b/packages/snort/snort_advanced.xml index 51fcaa90..35db6945 100644 --- a/packages/snort/snort_advanced.xml +++ b/packages/snort/snort_advanced.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -44,8 +45,9 @@ <description>Describe your package here</description> <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> - <title>Services: Snort Advanced</title> <name>SnortAdvanced</name> + <version>none</version> + <title>Services: Snort Advanced</title> <include_file>/usr/local/pkg/snort.inc</include_file> <tabs> <tab> @@ -106,8 +108,8 @@ <fieldname>configpassthru</fieldname> <description>Add items to here will be automatically inserted into the running snort configuration</description> <type>textarea</type> - <rows>5</rows> <cols>40</cols> + <rows>5</rows> </field> </fields> <custom_php_deinstall_command> diff --git a/packages/snort/snort_whitelist.xml b/packages/snort/snort_whitelist.xml index 54347b74..5ac41802 100644 --- a/packages/snort/snort_whitelist.xml +++ b/packages/snort/snort_whitelist.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> diff --git a/packages/squid-head/squid.xml b/packages/squid-head/squid.xml index 04a06829..67f4c2aa 100644 --- a/packages/squid-head/squid.xml +++ b/packages/squid-head/squid.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -44,41 +45,11 @@ <description>Describe your package here</description> <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> + <name>squid</name> + <version>none</version> + <title>Proxy server: General settings</title> <include_file>squid.inc</include_file> - <!-- Installation --> - <additional_files_needed> - <item>http://www.pfsense.org/packages/config/squid.inc</item> - </additional_files_needed> - <additional_files_needed> - <item>http://www.pfsense.org/packages/config/squid_cache.xml</item> - </additional_files_needed> - <additional_files_needed> - <item>http://www.pfsense.org/packages/config/squid_nac.xml</item> - </additional_files_needed> - <additional_files_needed> - <item>http://www.pfsense.org/packages/config/squid_traffic.xml</item> - </additional_files_needed> - <additional_files_needed> - <item>http://www.pfsense.org/packages/config/squid_upstream.xml</item> - </additional_files_needed> - <additional_files_needed> - <item>http://www.pfsense.org/packages/config/squid_auth.xml</item> - </additional_files_needed> - <additional_files_needed> - <item>http://www.pfsense.org/packages/config/squid_users.xml</item> - </additional_files_needed> - <additional_files_needed> - <item>http://www.pfsense.org/packages/All/squid_monitor.sh</item> - <prefix>/usr/local/bin/</prefix> - <chmod>0755</chmod> - </additional_files_needed> - <custom_php_install_command> - squid_install_command(); - </custom_php_install_command> - <custom_php_deinstall_command> - squid_deinstall_command(); - </custom_php_deinstall_command> <menu> <name>Web proxy cache</name> <tooltiptext>Modify the web proxy cache's settings</tooltiptext> @@ -87,14 +58,10 @@ </menu> <service> <name>Squid</name> - <description>Web proxy cache.</description> <rcfile>squid.sh</rcfile> <executable>squid</executable> + <description>Web proxy cache.</description> </service> - - <!-- Interface --> - <name>squid</name> - <title>Proxy server: General settings</title> <tabs> <tab> <text>General settings</text> @@ -126,81 +93,108 @@ <url>/pkg.php?xml=squid_users.xml</url> </tab> </tabs> + <!-- Installation --> + <additional_files_needed> + <item>http://www.pfsense.org/packages/config/squid.inc</item> + </additional_files_needed> + <additional_files_needed> + <item>http://www.pfsense.org/packages/config/squid_cache.xml</item> + </additional_files_needed> + <additional_files_needed> + <item>http://www.pfsense.org/packages/config/squid_nac.xml</item> + </additional_files_needed> + <additional_files_needed> + <item>http://www.pfsense.org/packages/config/squid_traffic.xml</item> + </additional_files_needed> + <additional_files_needed> + <item>http://www.pfsense.org/packages/config/squid_upstream.xml</item> + </additional_files_needed> + <additional_files_needed> + <item>http://www.pfsense.org/packages/config/squid_auth.xml</item> + </additional_files_needed> + <additional_files_needed> + <item>http://www.pfsense.org/packages/config/squid_users.xml</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/bin/</prefix> + <chmod>0755</chmod> + <item>http://www.pfsense.org/packages/All/squid_monitor.sh</item> + </additional_files_needed> <fields> <field> - <fieldname>active_interface</fieldname> <fielddescr>Proxy interface</fielddescr> + <fieldname>active_interface</fieldname> <description>The interface(s) the proxy server will bind to.</description> - <default_value>lan</default_value> - <required/> <type>interfaces_selection</type> + <required/> + <default_value>lan</default_value> <multiple/> </field> <field> - <fieldname>allow_interface</fieldname> <fielddescr>Allow users on interface</fielddescr> + <fieldname>allow_interface</fieldname> <description>If this field is checked, the users connected to the interface selected in the 'Proxy interface' field will be allowed to use the proxy, i.e., there will be no need to add the interface's subnet to the list of allowed subnets. This is just a shortcut.</description> - <default_value>on</default_value> - <required/> <type>checkbox</type> + <required/> + <default_value>on</default_value> </field> <field> - <fieldname>transparent_proxy</fieldname> <fielddescr>Transparent proxy</fielddescr> + <fieldname>transparent_proxy</fieldname> <description>If transparent mode is enabled, all requests for destination port 80 will be forwarded to the proxy server without any additional configuration necessary.</description> - <required/> <type>checkbox</type> + <required/> </field> <field> - <fieldname>log_enabled</fieldname> <fielddescr>Enabled logging</fielddescr> + <fieldname>log_enabled</fieldname> <description>This will enable the access log. Don't switch this on if you don't have much disk space left.</description> - <enablefields>log_query_terms,log_user_agents</enablefields> <type>checkbox</type> + <enablefields>log_query_terms,log_user_agents</enablefields> </field> <field> - <fieldname>proxy_port</fieldname> <fielddescr>Proxy port</fielddescr> + <fieldname>proxy_port</fieldname> <description>This is the port the proxy server will listen on.</description> - <required/> <type>input</type> <size>5</size> + <required/> <default_value>3128</default_value> </field> <field> - <fieldname>icp_port</fieldname> <fielddescr>ICP port</fielddescr> + <fieldname>icp_port</fieldname> <description>This is the port the proxy server will send and receive ICP queries to and from neighbor caches. Leave this blank if you don't want the proxy server to communicate with neighbor caches through ICP.</description> <type>input</type> <size>5</size> </field> <field> - <fieldname>visible_hostname</fieldname> <fielddescr>Visible hostname</fielddescr> + <fieldname>visible_hostname</fieldname> <description>This is the hostname to be displayed in proxy server error messages.</description> - <default_value>localhost</default_value> <type>input</type> + <default_value>localhost</default_value> </field> <field> - <fieldname>admin_email</fieldname> <fielddescr>Administrator email</fielddescr> + <fieldname>admin_email</fieldname> <description>This is the email address displayed in error messages to the users.</description> - <default_value>admin@localhost</default_value> <type>input</type> + <default_value>admin@localhost</default_value> </field> <field> <fielddescr>Language</fielddescr> <fieldname>error_language</fieldname> <description>Select the language in which the proxy server will display error messages to users.</description> - <default_value>English</default_value> <type>select</type> + <default_value>English</default_value> </field> <field> <fielddescr>Redirect children</fielddescr> <fieldname>redirect_children</fieldname> <description>Specify the number of redirectors to spawn (if using redirectors at all) when launching Squid. If you leave this field blank, Squid will start 5 redirector processes. If your network load is high, feel free to increase this value (at the expense of a higher memory consumption).</description> - <default_value>5</default_value> <type>input</type> + <default_value>5</default_value> </field> </fields> <custom_php_command_before_form> @@ -212,4 +206,10 @@ <custom_php_resync_config_command> squid_resync(); </custom_php_resync_config_command> + <custom_php_install_command> + squid_install_command(); + </custom_php_install_command> + <custom_php_deinstall_command> + squid_deinstall_command(); + </custom_php_deinstall_command> </packagegui> diff --git a/packages/squid-head/squid_auth.xml b/packages/squid-head/squid_auth.xml index 05875c59..15910f97 100644 --- a/packages/squid-head/squid_auth.xml +++ b/packages/squid-head/squid_auth.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -44,9 +45,10 @@ <description>Describe your package here</description> <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> - <include_file>squid.inc</include_file> <name>squidauth</name> + <version>none</version> <title>Proxy server: Authentication</title> + <include_file>squid.inc</include_file> <tabs> <tab> <text>General settings</text> @@ -83,8 +85,8 @@ <fielddescr>Authentication method</fielddescr> <fieldname>auth_method</fieldname> <description>Select an authentication method. This will allow users to be authenticated by local or external services.</description> - <default_value>none</default_value> <type>select</type> + <default_value>none</default_value> <options> <option><name>None</name><value>none</value></option> <option><name>Local</name><value>local</value></option> @@ -95,99 +97,96 @@ <onchange>on_auth_method_changed()</onchange> </field> <field> - <fieldname>auth_server</fieldname> <fielddescr>Authentication server</fielddescr> + <fieldname>auth_server</fieldname> <description>Enter here the IP or hostname of the server that will perform the authentication. For NT domain authentication, this is the Primary Domain Controller (PDC).</description> <type>input</type> </field> <field> - <fieldname>auth_server_port</fieldname> <fielddescr>Authentication server port</fielddescr> + <fieldname>auth_server_port</fieldname> <description>Enter here the port to use to connect to the authentication server. Leave this field blank to use the authentication method's default port.</description> <type>input</type> </field> <field> - <fieldname>ldap_user</fieldname> <fielddescr>LDAP server user DN</fielddescr> + <fieldname>ldap_user</fieldname> <description>Enter here the user distinguished name (DN) to bind to connect to the LDAP server (e.g., "cn=Administrator,cn=Users,dc=foobar,dc=com"). You can leave this field blank if you don't want to use authentication.</description> <type>input</type> </field> <field> - <fieldname>ldap_password</fieldname> <fielddescr>LDAP password</fielddescr> + <fieldname>ldap_password</fieldname> <description>Enter here the password to use to connect to the LDAP server. You may leave this field unfilled.</description> <type>password</type> </field> <field> - <fieldname>ldap_basedn</fieldname> <fielddescr>LDAP base DN</fielddescr> + <fieldname>ldap_basedn</fieldname> <description>For LDAP authentication, enter here the base DN for the search (e.g., "cn=Users,dc=foobar,dc=com").</description> <type>input</type> </field> <field> - <fieldname>ldap_filter</fieldname> <fielddescr>LDAP filter</fielddescr> + <fieldname>ldap_filter</fieldname> <description>Enter the string to be used to filter the results of the search, or leave this blank to get the results unfiltered. This must be in compliance with RFC 2254, and ocurrences of the string "%s" will be set to the username given to the proxy. You generally want something like '(sAMAccountName=%s)' here.</description> <type>input</type> <default_value>(sAMAccountName=%s)</default_value> </field> <field> - <fieldname>radius_secret</fieldname> <fielddescr>RADIUS secret</fielddescr> + <fieldname>radius_secret</fieldname> <description>The RADIUS secret for RADIUS authentication.</description> <type>password</type> </field> <field> - <fieldname>msnt_bdc</fieldname> <fielddescr>Backup Domain Controller</fielddescr> + <fieldname>msnt_bdc</fieldname> <description>Enter the address of the Backup Domain Controller (BDC) or leave this field blank if you don't want to use a backup controller.</description> <type>input</type> </field> <field> - <fieldname>msnt_domain</fieldname> <fielddescr>NT domain</fielddescr> + <fieldname>msnt_domain</fieldname> <description>Enter the NT domain to be used.</description> <type>input</type> </field> <field> - <fieldname>auth_prompt</fieldname> <fielddescr>Authentication prompt</fielddescr> + <fieldname>auth_prompt</fieldname> <description>This string will be displayed at the top of the authentication request window.</description> - <default_value>Please enter your credentials to access the proxy</default_value> <type>input</type> + <default_value>Please enter your credentials to access the proxy</default_value> </field> <field> - <fieldname>auth_processes</fieldname> <fielddescr>Authentication processes</fielddescr> + <fieldname>auth_processes</fieldname> <description>The number of authenticator processes to spawn. If many authentications are expected within a short timeframe, increase this number accordingly.</description> - <default_value>5</default_value> <type>input</type> + <default_value>5</default_value> </field> <field> - <fieldname>auth_ttl</fieldname> <fielddescr>Authentication TTL</fielddescr> + <fieldname>auth_ttl</fieldname> <description>This specifies for how long (in minutes) the proxy server assumes an externally validated username and password combination is valid (Time To Live). When the TTL expires, the user will be prompted for credentials again.</description> - <default_value>60</default_value> <type>input</type> + <default_value>60</default_value> </field> <field> - <fieldname>unrestricted_auth</fieldname> <fielddescr>Requiere authentication for unrestricted hosts</fielddescr> + <fieldname>unrestricted_auth</fieldname> <description>If this option is enabled, even users tagged as unrestricted through access control are required to authenticate to use the proxy.</description> <type>checkbox</type> </field> <field> - <fieldname>no_auth_hosts</fieldname> <fielddescr>Subnets that don't need authentication</fielddescr> + <fieldname>no_auth_hosts</fieldname> <description>A comma-separated list of subnets (in CIDR range, e.g.: 10.5.0.0/16, 192.168.1.50/32) whose hosts won't be asked for authentication to access the proxy.</description> <type>textarea</type> - <rows>5</rows> <cols>50</cols> + <rows>5</rows> </field> </fields> - <custom_php_after_head_command> - squid_print_javascript_auth(); - </custom_php_after_head_command> <custom_php_validation_command> squid_validate_auth($_POST, &$input_errors); </custom_php_validation_command> @@ -197,4 +196,7 @@ <custom_php_resync_config_command> squid_resync(); </custom_php_resync_config_command> + <custom_php_after_head_command> + squid_print_javascript_auth(); + </custom_php_after_head_command> </packagegui> diff --git a/packages/squid-head/squid_cache.xml b/packages/squid-head/squid_cache.xml index c50cef2e..3fe0475f 100644 --- a/packages/squid-head/squid_cache.xml +++ b/packages/squid-head/squid_cache.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -44,9 +45,10 @@ <description>Describe your package here</description> <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> - <include_file>squid.inc</include_file> <name>squidcache</name> + <version>none</version> <title>Proxy server: Cache management</title> + <include_file>squid.inc</include_file> <tabs> <tab> <text>General settings</text> @@ -83,40 +85,40 @@ <fielddescr>Hard disk cache size</fielddescr> <fieldname>harddisk_cache_size</fieldname> <description>This is the amount of disk space (in megabytes) to use for cached objects.</description> + <type>input</type> <required/> <default_value>100</default_value> - <type>input</type> </field> <field> <fielddescr>Memory cache size</fielddescr> <fieldname>memory_cache_size</fieldname> <description>This is the amount of physical RAM (in megabytes) to be used for negative cache and in-transit objects. This value should not exceed more than 50% of the installed RAM. The minimum value is 1MB.</description> + <type>input</type> <required/> <default_value>8</default_value> - <type>input</type> </field> <field> <fielddescr>Minimum object size</fielddescr> <fieldname>minimum_object_size</fieldname> <description>Objects smaller than the size specified (in kilobytes) will not be saved on disk. The default value is 0, meaning there is no minimum.</description> + <type>input</type> <required/> <default_value>0</default_value> - <type>input</type> </field> <field> <fielddescr>Maximum object size</fielddescr> <fieldname>maximum_object_size</fieldname> <description>Objects larger than the size specified (in kilobytes) will not be saved on disk. If you wish to increase speed more than you want to save bandwidth, this should be set to a low value.</description> + <type>input</type> <required/> <default_value>4</default_value> - <type>input</type> </field> <field> <fielddescr>Level 1 subdirectories</fielddescr> <fieldname>level1_subdirs</fieldname> <description>Each level 1 (L1) directory contains 256 subdirectories, so a value of 256 L1 directories will use a total of 65536 directories for the hard disk cache. This will significantly slow down the startup process of the proxy service, but can speed up the caching under certain conditions.</description> - <default_value>16</default_value> <type>select</type> + <default_value>16</default_value> <options> <option><name>4</name><value>4</value></option> <option><name>8</name><value>8</value></option> @@ -131,8 +133,8 @@ <fielddescr>Memory replacement policy</fielddescr> <fieldname>memory_replacement</fieldname> <description>The memory replacement policy determines which objects are purged from memory when space is needed. The default policy for memory replacement is GDSF.</description> - <default_value>heap GDSF</default_value> <type>select</type> + <default_value>heap GDSF</default_value> <options> <option><name>LRU</name><value>LRU</value></option> <option><name>Heap LRU</name><value>heap LRU</value></option> @@ -144,8 +146,8 @@ <fielddescr>Cache replacement policy</fielddescr> <fieldname>cache_replacement</fieldname> <description>The cache replacement policy decides which objects will remain in cache and which objects are replaced to create space for the new objects. The default policy for cache replacement is LFUDA.</description> - <default_value>heap LFUDA</default_value> <type>select</type> + <default_value>heap LFUDA</default_value> <options> <option><name>LRU</name><value>lru</value></option> <option><name>Heap LRU</name><value>heap LRU</value></option> @@ -158,15 +160,15 @@ <fieldname>donotcache</fieldname> <description>The specified domains or IP addresses (separated by commas) will never be cached.</description> <type>textarea</type> - <rows>5</rows> <cols>50</cols> + <rows>5</rows> </field> <field> <fielddescr>Enable offline mode</fielddescr> <fieldname>enable_offline</fieldname> <description>Enable this option and the proxy server will never try to validate cached objects. The offline mode also gives access to more cached information than the proposed feature would allow (stale cached versions, where the origin server should have been contacted).</description> - <required/> <type>checkbox</type> + <required/> </field> </fields> <custom_php_validation_command> diff --git a/packages/squid-head/squid_nac.xml b/packages/squid-head/squid_nac.xml index bbeaa149..db49a1ba 100644 --- a/packages/squid-head/squid_nac.xml +++ b/packages/squid-head/squid_nac.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -44,9 +45,10 @@ <description>Describe your package here</description> <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> - <include_file>squid.inc</include_file> <name>squidnac</name> + <version>none</version> <title>Proxy server: Access control</title> + <include_file>squid.inc</include_file> <tabs> <tab> <text>General settings</text> @@ -80,60 +82,60 @@ </tabs> <fields> <field> - <fieldname>allowed_subnets</fieldname> <fielddescr>Allowed subnets</fielddescr> + <fieldname>allowed_subnets</fieldname> <description>Those are the subnets (separated by commas) that are allowed to use the proxy. The subnets must be expressed as CIDR ranges (e.g.: 192.168.1.0/24). Note that the proxy interface subnet is already an allowed subnet. All the other subnets won't be able to use the proxy.</description> <type>textarea</type> - <rows>5</rows> <cols>50</cols> + <rows>5</rows> </field> <field> - <fieldname>unrestricted_hosts</fieldname> <fielddescr>Unrestricted IPs</fielddescr> + <fieldname>unrestricted_hosts</fieldname> <description>The IP addresses specified here (separated by commas) won't be filtered out by the other access control directives set in this page.</description> <type>textarea</type> - <rows>5</rows> <cols>50</cols> + <rows>5</rows> </field> <field> - <fieldname>unrestricted_macs</fieldname> <fielddescr>Unrestricted MAC Addresses</fielddescr> + <fieldname>unrestricted_macs</fieldname> <description>The MAC addresses specified here (separated by commas) won't be filtered out by the other access control directives set in this page.</description> <type>textarea</type> - <rows>5</rows> <cols>50</cols> + <rows>5</rows> </field> <field> - <fieldname>banned_hosts</fieldname> <fielddescr>Banned host addresses</fielddescr> + <fieldname>banned_hosts</fieldname> <description>The IP addresses specified here (separated by commas) won't be allowed to use the proxy.</description> <type>textarea</type> - <rows>5</rows> <cols>50</cols> + <rows>5</rows> </field> <field> - <fieldname>banned_macs</fieldname> <fielddescr>Banned MAC addresses</fielddescr> + <fieldname>banned_macs</fieldname> <description>The MAC addresses specified here (separated by commas) won't be allowed to use the proxy.</description> <type>textarea</type> - <rows>5</rows> <cols>50</cols> + <rows>5</rows> </field> <field> - <fieldname>whitelist</fieldname> <fielddescr>Whitelist</fielddescr> + <fieldname>whitelist</fieldname> <description>Those are the sites (separated by commas) that will be accessable to the users that are allowed to use the proxy.</description> <type>textarea</type> - <rows>5</rows> <cols>50</cols> + <rows>5</rows> </field> <field> - <fieldname>blacklist</fieldname> <fielddescr>Blacklist</fielddescr> + <fieldname>blacklist</fieldname> <description>Those are the sites (separated by commas) that will be blocked to the users that are allowed to use the proxy.</description> <type>textarea</type> - <rows>5</rows> <cols>50</cols> + <rows>5</rows> </field> </fields> <custom_php_validation_command> diff --git a/packages/squid-head/squid_traffic.xml b/packages/squid-head/squid_traffic.xml index f9bf3c6a..d69f2510 100644 --- a/packages/squid-head/squid_traffic.xml +++ b/packages/squid-head/squid_traffic.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -44,9 +45,10 @@ <description>Describe your package here</description> <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> - <include_file>squid.inc</include_file> <name>squidtraffic</name> + <version>none</version> <title>Proxy server: Traffic management</title> + <include_file>squid.inc</include_file> <tabs> <tab> <text>General settings</text> @@ -80,90 +82,90 @@ </tabs> <fields> <field> - <fieldname>max_download_size</fieldname> <fielddescr>Maximum download size</fielddescr> + <fieldname>max_download_size</fieldname> <description>Limit the maximum total download size to the size specified here (in kilobytes). Downloads bigger than the specified size will be denied. Set to 0 to disable.</description> - <default_value>0</default_value> - <required/> <type>input</type> + <required/> + <default_value>0</default_value> </field> <field> - <fieldname>max_upload_size</fieldname> <fielddescr>Maximum upload size</fielddescr> + <fieldname>max_upload_size</fieldname> <description>Limit the maximum total upload size to the size specified here (in kilobytes). Uploads bigger than the specified size will be denied. Set to 0 to disable.</description> - <default_value>0</default_value> - <required/> <type>input</type> + <required/> + <default_value>0</default_value> </field> <field> - <fieldname>overall_capping</fieldname> <fielddescr>Overall capping</fielddescr> + <fieldname>overall_capping</fieldname> <description>Caps the download speeds of the network that connects to the proxy as a whole at the specified size (in kilobytes per second). Set to 0 to disable.</description> - <default_value>0</default_value> - <required/> <type>input</type> + <required/> + <default_value>0</default_value> </field> <field> - <fieldname>perhost_capping</fieldname> <fielddescr>Per-host capping</fielddescr> + <fieldname>perhost_capping</fieldname> <description>Caps the download speeds of each user that connects to the proxy at the specified size (in kilobytes per second). Set to 0 to disable.</description> - <default_value>0</default_value> - <required/> <type>input</type> + <required/> + <default_value>0</default_value> </field> <field> - <fieldname>overall_throttling</fieldname> <fielddescr>Overall bandwidth throttling</fielddescr> + <fieldname>overall_throttling</fieldname> <description>This value specifies (in kilobytes per second) the bandwidth throttle for downloads. Users will gradually have their download speed increased according to this value. Set to 0 to disable bandwidth throttling.</description> - <default_value>0</default_value> - <required/> <type>input</type> + <required/> + <default_value>0</default_value> </field> <field> - <fieldname>perhost_throttling</fieldname> <fielddescr>Per-host throttling</fielddescr> + <fieldname>perhost_throttling</fieldname> <description>This value specifies the download throttling per host. Set to 0 to disable this.</description> - <default_value>0</default_value> - <required/> <type>input</type> + <required/> + <default_value>0</default_value> </field> <field> - <fieldname>initial_bucket_level</fieldname> <fielddescr>Initial bucket level</fielddescr> + <fieldname>initial_bucket_level</fieldname> <description>The initial bucket level is used to determine how much is put in each bucket when a connection is established. Set to 0 to set the initial bucket level to 100%.</description> - <default_value>0</default_value> - <required/> <type>input</type> + <required/> + <default_value>0</default_value> </field> <field> - <fieldname>throttle_specific</fieldname> <fielddescr>Throttle only specific extensions</fielddescr> + <fieldname>throttle_specific</fieldname> <description>Leave this checked to be able to choose the extensions that throttling will be applied to. Otherwise, all files will be throttled.</description> - <default_value>on</default_value> <type>checkbox</type> <enablefields>throttle_binaries,throttle_cdimages,throttle_multimedia,throttle_others</enablefields> + <default_value>on</default_value> </field> <field> - <fieldname>throttle_binaries</fieldname> <fielddescr>Throttle binary files</fielddescr> + <fieldname>throttle_binaries</fieldname> <description>Check this to apply bandwidth throttle to binary files. This includes compressed archives and executables.</description> <type>checkbox</type> </field> <field> - <fieldname>throttle_cdimages</fieldname> <fielddescr>Throttle CD images</fielddescr> + <fieldname>throttle_cdimages</fieldname> <description>Check this to apply bandwidth throttle to CD image files.</description> <type>checkbox</type> </field> <field> - <fieldname>throttle_multimedia</fieldname> <fielddescr>Throttle multimedia files</fielddescr> + <fieldname>throttle_multimedia</fieldname> <description>Check this to apply bandwidth throttle to multimedia files, such as movies or songs.</description> <type>checkbox</type> </field> <field> - <fieldname>throttle_others</fieldname> <fielddescr>Throttle other extensions</fielddescr> + <fieldname>throttle_others</fieldname> <description>Comma-separated list of extensions to apply bandwidth throttle to.</description> <type>input</type> </field> diff --git a/packages/squid-head/squid_upstream.xml b/packages/squid-head/squid_upstream.xml index 700163ec..b02a21b4 100644 --- a/packages/squid-head/squid_upstream.xml +++ b/packages/squid-head/squid_upstream.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -44,9 +45,10 @@ <description>Describe your package here</description> <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> - <include_file>squid.inc</include_file> <name>squidupstream</name> + <version>none</version> <title>Proxy server: Upstream proxy settings</title> + <include_file>squid.inc</include_file> <tabs> <tab> <text>General settings</text> @@ -83,9 +85,9 @@ <fielddescr>Enable forwarding</fielddescr> <fieldname>proxy_forwarding</fieldname> <description>This option enables the proxy server to forward requests to an upstream server.</description> - <required/> <type>checkbox</type> <enablefields>proxy_addr,proxy_port,icp_port,username,password</enablefields> + <required/> </field> <field> <fielddescr>Hostname</fielddescr> @@ -97,17 +99,17 @@ <fielddescr>TCP port</fielddescr> <fieldname>proxy_port</fieldname> <description>Enter the port to use to connect to the upstream proxy.</description> - <default_value>3128</default_value> <type>input</type> <size>5</size> + <default_value>3128</default_value> </field> <field> <fielddescr>ICP port</fielddescr> <fieldname>icp_port</fieldname> <description>Enter the port to connect to the upstream proxy for the ICP protocol. Use port number 7 to disable ICP communication between the proxies.</description> - <default_value>7</default_value> <type>input</type> <size>5</size> + <default_value>7</default_value> </field> <field> <fielddescr>Username</fielddescr> diff --git a/packages/squid-head/squid_users.xml b/packages/squid-head/squid_users.xml index 0854007c..34260817 100644 --- a/packages/squid-head/squid_users.xml +++ b/packages/squid-head/squid_users.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -44,9 +45,10 @@ <description>Describe your package here</description> <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> - <include_file>squid.inc</include_file> <name>squidusers</name> + <version>none</version> <title>Proxy server: Local users</title> + <include_file>squid.inc</include_file> <delete_string>A proxy server user has been deleted.</delete_string> <addedit_string>A proxy server user has been created/modified.</addedit_string> <tabs> @@ -82,32 +84,32 @@ </tabs> <adddeleteeditpagefields> <columnitem> - <fieldname>username</fieldname> <fielddescr>Username</fielddescr> + <fieldname>username</fieldname> </columnitem> <columnitem> - <fieldname>description</fieldname> <fielddescr>Description</fielddescr> + <fieldname>description</fieldname> </columnitem> </adddeleteeditpagefields> <fields> <field> - <fieldname>username</fieldname> <fielddescr>Username</fielddescr> + <fieldname>username</fieldname> <description>Enter the username here.</description> - <required/> <type>input</type> + <required/> </field> <field> - <fieldname>password</fieldname> <fielddescr>Password</fielddescr> + <fieldname>password</fieldname> <description>Enter the password here.</description> - <required/> <type>password</type> + <required/> </field> <field> - <fieldname>description</fieldname> <fielddescr>Description</fielddescr> + <fieldname>description</fieldname> <description>You may enter a description here for your reference (not parsed).</description> <type>input</type> </field> diff --git a/packages/squid/squid.xml b/packages/squid/squid.xml index f17c4be2..0370aff2 100644 --- a/packages/squid/squid.xml +++ b/packages/squid/squid.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -46,7 +47,51 @@ <faq>Currently there are no FAQ items provided.</faq> <name>squid</name> <version>2.6.5_1-p15</version> + <title>Proxy server: General settings</title> <include_file>/usr/local/pkg/squid.inc</include_file> + <menu> + <name>Proxy server</name> + <tooltiptext>Modify the proxy server's settings</tooltiptext> + <section>Services</section> + <url>/pkg_edit.php?xml=squid.xml&id=0</url> + </menu> + <service> + <name>squid</name> + <rcfile>squid.sh</rcfile> + <executable>squid</executable> + <description>Proxy server Service</description> + </service> + <tabs> + <tab> + <text>General settings</text> + <url>/pkg_edit.php?xml=squid.xml&id=0</url> + <active/> + </tab> + <tab> + <text>Upstream proxy</text> + <url>/pkg_edit.php?xml=squid_upstream.xml&id=0</url> + </tab> + <tab> + <text>Cache management</text> + <url>/pkg_edit.php?xml=squid_cache.xml&id=0</url> + </tab> + <tab> + <text>Access control</text> + <url>/pkg_edit.php?xml=squid_nac.xml&id=0</url> + </tab> + <tab> + <text>Traffic management</text> + <url>/pkg_edit.php?xml=squid_traffic.xml&id=0</url> + </tab> + <tab> + <text>Auth settings</text> + <url>/pkg_edit.php?xml=squid_auth.xml&id=0</url> + </tab> + <tab> + <text>Local users</text> + <url>/pkg.php?xml=squid_users.xml</url> + </tab> + </tabs> <!-- Installation --> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> @@ -89,139 +134,94 @@ <item>http://www.pfsense.org/packages/config/squid/squid_users.xml</item> </additional_files_needed> <additional_files_needed> - <item>http://www.pfsense.org/packages/config/squid/proxy_monitor.sh</item> <prefix>/usr/local/etc/rc.d/</prefix> <chmod>0755</chmod> + <item>http://www.pfsense.org/packages/config/squid/proxy_monitor.sh</item> </additional_files_needed> <additional_files_needed> - <item>http://www.pfsense.org/packages/config/squid/squid_cache.xml</item> <prefix>/usr/local/pkg/</prefix> <chmod>0755</chmod> + <item>http://www.pfsense.org/packages/config/squid/squid_cache.xml</item> </additional_files_needed> - <menu> - <name>Proxy server</name> - <tooltiptext>Modify the proxy server's settings</tooltiptext> - <section>Services</section> - <url>/pkg_edit.php?xml=squid.xml&id=0</url> - </menu> - <service> - <name>squid</name> - <description>Proxy server Service</description> - <rcfile>squid.sh</rcfile> - <executable>squid</executable> - </service> - <!-- Interface --> - <title>Proxy server: General settings</title> - <tabs> - <tab> - <text>General settings</text> - <url>/pkg_edit.php?xml=squid.xml&id=0</url> - <active/> - </tab> - <tab> - <text>Upstream proxy</text> - <url>/pkg_edit.php?xml=squid_upstream.xml&id=0</url> - </tab> - <tab> - <text>Cache management</text> - <url>/pkg_edit.php?xml=squid_cache.xml&id=0</url> - </tab> - <tab> - <text>Access control</text> - <url>/pkg_edit.php?xml=squid_nac.xml&id=0</url> - </tab> - <tab> - <text>Traffic management</text> - <url>/pkg_edit.php?xml=squid_traffic.xml&id=0</url> - </tab> - <tab> - <text>Auth settings</text> - <url>/pkg_edit.php?xml=squid_auth.xml&id=0</url> - </tab> - <tab> - <text>Local users</text> - <url>/pkg.php?xml=squid_users.xml</url> - </tab> - </tabs> <fields> <field> - <fieldname>active_interface</fieldname> <fielddescr>Proxy interface</fielddescr> + <fieldname>active_interface</fieldname> <description>The interface(s) the proxy server will bind to.</description> - <default_value>lan</default_value> - <required/> <type>interfaces_selection</type> + <required/> + <default_value>lan</default_value> <multiple/> </field> <field> - <fieldname>allow_interface</fieldname> <fielddescr>Allow users on interface</fielddescr> + <fieldname>allow_interface</fieldname> <description>If this field is checked, the users connected to the interface selected in the 'Proxy interface' field will be allowed to use the proxy, i.e., there will be no need to add the interface's subnet to the list of allowed subnets. This is just a shortcut.</description> - <default_value>on</default_value> - <required/> <type>checkbox</type> + <required/> + <default_value>on</default_value> </field> <field> - <fieldname>transparent_proxy</fieldname> <fielddescr>Transparent proxy</fielddescr> + <fieldname>transparent_proxy</fieldname> <description>If transparent mode is enabled, all requests for destination port 80 will be forwarded to the proxy server without any additional configuration necessary.</description> - <required/> <type>checkbox</type> + <required/> </field> <field> - <fieldname>log_enabled</fieldname> <fielddescr>Enabled logging</fielddescr> + <fieldname>log_enabled</fieldname> <description>This will enable the access log. Don't switch this on if you don't have much disk space left.</description> - <enablefields>log_query_terms,log_user_agents</enablefields> <type>checkbox</type> + <enablefields>log_query_terms,log_user_agents</enablefields> </field> <field> - <fieldname>log_dir</fieldname> <fielddescr>Log store directory</fielddescr> + <fieldname>log_dir</fieldname> <description>The directory where the log will be stored (note: do not end with a / mark)</description> - <required/> <type>input</type> <size>60</size> + <required/> <default_value>/var/squid/log</default_value> </field> <field> - <fieldname>proxy_port</fieldname> <fielddescr>Proxy port</fielddescr> + <fieldname>proxy_port</fieldname> <description>This is the port the proxy server will listen on.</description> - <required/> <type>input</type> <size>5</size> + <required/> <default_value>3128</default_value> </field> <field> - <fieldname>icp_port</fieldname> <fielddescr>ICP port</fielddescr> + <fieldname>icp_port</fieldname> <description>This is the port the Proxy Server will send and receive ICP queries to and from neighbor caches. Leave this blank if you don't want the proxy server to communicate with neighbor caches through ICP.</description> <type>input</type> <size>5</size> </field> <field> - <fieldname>visible_hostname</fieldname> <fielddescr>Visible hostname</fielddescr> + <fieldname>visible_hostname</fieldname> <description>This is the URL to be displayed in proxy server error messages.</description> - <default_value>localhost</default_value> <type>input</type> <size>60</size> + <default_value>localhost</default_value> </field> <field> - <fieldname>admin_email</fieldname> <fielddescr>Administrator email</fielddescr> + <fieldname>admin_email</fieldname> <description>This is the email address displayed in error messages to the users.</description> - <default_value>admin@localhost</default_value> <type>input</type> <size>60</size> + <default_value>admin@localhost</default_value> </field> <field> <fielddescr>Language</fielddescr> <fieldname>error_language</fieldname> <description>Select the language in which the proxy server will display error messages to users.</description> - <default_value>English</default_value> <type>select</type> + <default_value>English</default_value> </field> <field> <fielddescr>Disable X-Forward</fielddescr> @@ -240,37 +240,37 @@ <fieldname>uri_whitespace</fieldname> <description><b> strip:</b> The whitespace characters are stripped out of the URL. This is the behavior recommended by RFC2396. <p> <b> deny:</b> The request is denied. The user receives an "Invalid Request" message.<p> <b> allow:</b> The request is allowed and the URI is not changed. The whitespace characters remain in the URI.<p> <b> encode:</b> The request is allowed and the whitespace characters are encoded according to RFC1738.<p> <b> chop:</b> The request is allowed and the URI is chopped at the first whitespace.</description> <type>select</type> + <default_value>strip</default_value> <options> <option> - <value>strip</value> <name>strip</name> + <value>strip</value> </option> <option> - <value>deny</value> <name>deny</name> + <value>deny</value> </option> <option> - <value>allow</value> <name>allow</name> + <value>allow</value> </option> <option> - <value>encode</value> <name>encode</name> + <value>encode</value> </option> <option> - <value>chop</value> <name>chop</name> + <value>chop</value> </option> </options> - <default_value>strip</default_value> </field> </fields> - <custom_add_php_command> - squid_resync(); - </custom_add_php_command> <custom_php_command_before_form> squid_before_form_general(&$pkg); </custom_php_command_before_form> + <custom_add_php_command> + squid_resync(); + </custom_add_php_command> <custom_php_validation_command> squid_validate_general($_POST, &$input_errors); </custom_php_validation_command> diff --git a/packages/squid/squid_auth.xml b/packages/squid/squid_auth.xml index d763bb72..b3e7c5c1 100644 --- a/packages/squid/squid_auth.xml +++ b/packages/squid/squid_auth.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -44,9 +45,10 @@ <description>Describe your package here</description> <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> - <include_file>squid.inc</include_file> <name>squidauth</name> + <version>none</version> <title>Proxy server: Authentication</title> + <include_file>squid.inc</include_file> <tabs> <tab> <text>General settings</text> @@ -83,9 +85,9 @@ <fielddescr>Authentication method</fielddescr> <fieldname>auth_method</fieldname> <description>Select an authentication method. This will allow users to be authenticated by local or external services.</description> - <default_value>none</default_value> - <required/> <type>select</type> + <required/> + <default_value>none</default_value> <options> <option><name>None</name><value>none</value></option> <option><name>Local</name><value>local</value></option> @@ -96,128 +98,128 @@ <onchange>on_auth_method_changed()</onchange> </field> <field> - <fieldname>ldap_version</fieldname> <fielddescr>LDAP version</fielddescr> + <fieldname>ldap_version</fieldname> <description>Enter LDAP protocol version (2 or 3).</description> - <default_value>2</default_value> <type>select</type> + <default_value>2</default_value> <options> <option><name>2</name><value>2</value></option> <option><name>3</name><value>3</value></option> </options> </field> <field> - <fieldname>auth_server</fieldname> <fielddescr>Authentication server</fielddescr> + <fieldname>auth_server</fieldname> <description>Enter here the IP or hostname of the server that will perform the authentication.</description> <type>input</type> <size>60</size> </field> <field> - <fieldname>auth_server_port</fieldname> <fielddescr>Authentication server port</fielddescr> + <fieldname>auth_server_port</fieldname> <description>Enter here the port to use to connect to the authentication server. Leave this field blank to use the authentication method's default port.</description> <type>input</type> <size>60</size> </field> <field> - <fieldname>ldap_user</fieldname> <fielddescr>LDAP server user DN</fielddescr> + <fieldname>ldap_user</fieldname> <description>Enter here the user DN to use to connect to the LDAP server.</description> <type>input</type> <size>60</size> </field> <field> - <fieldname>ldap_pass</fieldname> <fielddescr>LDAP password</fielddescr> + <fieldname>ldap_pass</fieldname> <description>Enter here the password to use to connect to the LDAP server.</description> <type>password</type> <size>60</size> </field> <field> - <fieldname>ldap_basedomain</fieldname> <fielddescr>LDAP base domain</fielddescr> + <fieldname>ldap_basedomain</fieldname> <description>For LDAP authentication, enter here the base domain in the LDAP server.</description> <type>input</type> <size>60</size> </field> <field> - <fieldname>ldap_filter</fieldname> <fielddescr>LDAP search filter</fielddescr> - <default_value>(&(objectClass=person)(uid=%s))</default_value> + <fieldname>ldap_filter</fieldname> <description>Enter LDAP search filter.</description> <type>input</type> <size>60</size> + <default_value>(&(objectClass=person)(uid=%s))</default_value> </field> <field> - <fieldname>radius_secret</fieldname> <fielddescr>RADIUS secret</fielddescr> + <fieldname>radius_secret</fieldname> <description>The RADIUS secret for RADIUS authentication.</description> <type>password</type> <size>60</size> </field> <field> - <fieldname>msnt_secondary</fieldname> <fielddescr>Secondary NT servers</fielddescr> + <fieldname>msnt_secondary</fieldname> <description>Comma-separated list of secondary servers to be used for NT domain authentication.</description> <type>input</type> <size>60</size> </field> <field> - <fieldname>auth_prompt</fieldname> <fielddescr>Authentication prompt</fielddescr> + <fieldname>auth_prompt</fieldname> <description>This string will be displayed at the top of the authentication request window.</description> - <default_value>Please enter your credentials to access the proxy</default_value> <type>input</type> + <default_value>Please enter your credentials to access the proxy</default_value> </field> <field> - <fieldname>auth_processes</fieldname> <fielddescr>Authentication processes</fielddescr> + <fieldname>auth_processes</fieldname> <description>The number of authenticator processes to spawn. If many authentications are expected within a short timeframe, increase this number accordingly.</description> - <default_value>5</default_value> <type>input</type> <size>60</size> + <default_value>5</default_value> </field> <field> - <fieldname>auth_ttl</fieldname> <fielddescr>Authentication TTL</fielddescr> + <fieldname>auth_ttl</fieldname> <description>This specifies for how long (in minutes) the proxy server assumes an externally validated username and password combination is valid (Time To Live). When the TTL expires, the user will be prompted for credentials again.</description> - <default_value>60</default_value> <type>input</type> <size>60</size> + <default_value>60</default_value> </field> <field> - <fieldname>unrestricted_auth</fieldname> <fielddescr>Requiere authentication for unrestricted hosts</fielddescr> + <fieldname>unrestricted_auth</fieldname> <description>If this option is enabled, even users tagged as unrestricted through access control are required to authenticate to use the proxy.</description> <type>checkbox</type> </field> <field> - <fieldname>no_auth_hosts</fieldname> <fielddescr>Subnets that don't need authentication</fielddescr> + <fieldname>no_auth_hosts</fieldname> <description>Enter each subnet or IP address on a new line (in CIDR format, e.g.: 10.5.0.0/16, 192.168.1.50/32) that should not be asked for authentication to access the proxy.</description> <type>textarea</type> - <encoding>base64</encoding> - <rows>5</rows> <cols>50</cols> + <rows>5</rows> + <encoding>base64</encoding> </field> </fields> - <custom_php_after_head_command> - $transparent_proxy = ($config['installedpackages']['squid']['config'][0]['transparent_proxy'] == 'on'); - if($transparent_proxy) - $input_errors[] = "Authentication cannot be enabled while transparent proxy mode is enabled"; - squid_print_javascript_auth(); - </custom_php_after_head_command> <custom_php_validation_command> squid_validate_auth($_POST, &$input_errors); </custom_php_validation_command> - <custom_php_before_form_command> - squid_print_javascript_auth2(); - </custom_php_before_form_command> <custom_php_after_form_command> squid_print_javascript_auth2(); </custom_php_after_form_command> <custom_php_resync_config_command> squid_resync(); </custom_php_resync_config_command> + <custom_php_before_form_command> + squid_print_javascript_auth2(); + </custom_php_before_form_command> + <custom_php_after_head_command> + $transparent_proxy = ($config['installedpackages']['squid']['config'][0]['transparent_proxy'] == 'on'); + if($transparent_proxy) + $input_errors[] = "Authentication cannot be enabled while transparent proxy mode is enabled"; + squid_print_javascript_auth(); + </custom_php_after_head_command> </packagegui> diff --git a/packages/squid/squid_cache.xml b/packages/squid/squid_cache.xml index f70918a9..861f96b8 100644 --- a/packages/squid/squid_cache.xml +++ b/packages/squid/squid_cache.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -44,9 +45,10 @@ <description>Describe your package here</description> <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> - <include_file>squid.inc</include_file> <name>squidcache</name> + <version>none</version> <title>Proxy server: Cache management</title> + <include_file>squid.inc</include_file> <tabs> <tab> <text>General settings</text> @@ -83,49 +85,49 @@ <fielddescr>Hard disk cache size</fielddescr> <fieldname>harddisk_cache_size</fieldname> <description>This is the amount of disk space (in megabytes) to use for cached objects.</description> + <type>input</type> <required/> <default_value>100</default_value> - <type>input</type> </field> <field> <fielddescr>Hard disk cache location</fielddescr> <fieldname>harddisk_cache_location</fieldname> <description>This is the directory where the cache will be stored. (note: do not end with a /). If you change this location, squid needs to make a new cache, this could take a while</description> + <type>input</type> + <size>60</size> <required/> <default_value>/var/squid/cache</default_value> - <size>60</size> - <type>input</type> </field> <field> <fielddescr>Memory cache size</fielddescr> <fieldname>memory_cache_size</fieldname> <description>This is the amount of physical RAM (in megabytes) to be used for negative cache and in-transit objects. This value should not exceed more than 50% of the installed RAM. The minimum value is 1MB.</description> + <type>input</type> <required/> <default_value>8</default_value> - <type>input</type> </field> <field> <fielddescr>Minimum object size</fielddescr> <fieldname>minimum_object_size</fieldname> <description>Objects smaller than the size specified (in kilobytes) will not be saved on disk. The default value is 0, meaning there is no minimum.</description> - <required/> - <default_value>0</default_value> <type>input</type> + <required /> + <default_value>0</default_value> </field> <field> <fielddescr>Maximum object size</fielddescr> <fieldname>maximum_object_size</fieldname> <description>Objects larger than the size specified (in kilobytes) will not be saved on disk. If you wish to increase speed more than you want to save bandwidth, this should be set to a low value.</description> + <type>input</type> <required/> <default_value>4</default_value> - <type>input</type> </field> <field> <fielddescr>Level 1 subdirectories</fielddescr> <fieldname>level1_subdirs</fieldname> <description>Each level-1 directory contains 256 subdirectories, so a value of 256 level-1 directories will use a total of 65536 directories for the hard disk cache. This will significantly slow down the startup process of the proxy service, but can speed up the caching under certain conditions.</description> - <default_value>16</default_value> <type>select</type> + <default_value>16</default_value> <options> <option><name>4</name><value>4</value></option> <option><name>8</name><value>8</value></option> @@ -140,8 +142,8 @@ <fielddescr>Memory replacement policy</fielddescr> <fieldname>memory_replacement</fieldname> <description>The memory replacement policy determines which objects are purged from memory when space is needed. The default policy for memory replacement is GDSF. <p> <b> LRU: Last Recently Used Policy </b> - The LRU policies keep recently referenced objects. i.e., it replaces the object that has not been accessed for the longest time. <p> <b> Heap GDSF: Greedy-Dual Size Frequency </b> - The Heap GDSF policy optimizes object-hit rate by keeping smaller, popular objects in cache. It achieves a lower byte hit rate than LFUDA though, since it evicts larger (possibly popular) objects. <p> <b> Heap LFUDA: Least Frequently Used with Dynamic Aging </b> - The Heap LFUDA policy keeps popular objects in cache regardless of their size and thus optimizes byte hit rate at the expense of hit rate since one large, popular object will prevent many smaller, slightly less popular objects from being cached. <p> <b> Heap LRU: Last Recently Used </b> - Works like LRU, but uses a heap instead. <p> Note: If using the LFUDA replacement policy, the value of Maximum Object Size should be increased above its default of 12KB to maximize the potential byte hit rate improvement of LFUDA.</description> - <default_value>heap GDSF</default_value> <type>select</type> + <default_value>heap GDSF</default_value> <options> <option><name>LRU</name><value>lru</value></option> <option><name>Heap LFUDA</name><value>heap LFUDA</value></option> @@ -153,8 +155,8 @@ <fielddescr>Cache replacement policy</fielddescr> <fieldname>cache_replacement</fieldname> <description>The cache replacement policy decides which objects will remain in cache and which objects are replaced to create space for the new objects. The default policy for cache replacement is LFUDA. Please see the type descriptions specified in the memory replacement policy for additional detail.</description> - <default_value>heap LFUDA</default_value> <type>select</type> + <default_value>heap LFUDA</default_value> <options> <option><name>LRU</name><value>lru</value></option> <option><name>Heap LFUDA</name><value>heap LFUDA</value></option> @@ -167,16 +169,16 @@ <fieldname>donotcache</fieldname> <description>Enter each domain or IP address on a new line that should never be cached.</description> <type>textarea</type> - <encoding>base64</encoding> - <rows>5</rows> <cols>50</cols> + <rows>5</rows> + <encoding>base64</encoding> </field> <field> <fielddescr>Enable offline mode</fielddescr> <fieldname>enable_offline</fieldname> <description>Enable this option and the proxy server will never try to validate cached objects. The offline mode gives access to more cached information than the proposed feature would allow (stale cached versions, where the origin server should have been contacted).</description> - <required/> <type>checkbox</type> + <required/> </field> </fields> <custom_php_command_before_form> diff --git a/packages/squid/squid_extauth.xml b/packages/squid/squid_extauth.xml index a465f81d..745e85d5 100644 --- a/packages/squid/squid_extauth.xml +++ b/packages/squid/squid_extauth.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -45,11 +46,9 @@ <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> <name>squidextnoauth</name> + <version>none</version> <title>Services: Proxy Server -> Extended Authentication Settings</title> - <configpath>installedpackages->package->squidextnoauth->configuration->settings</configpath> - <aftersaveredirect>/pkg_edit.php?xml=squid_extauth.xml&id=0</aftersaveredirect> - <tabs> <tab> <text>General Settings</text> @@ -88,11 +87,12 @@ </tab> </tabs> - + <configpath>installedpackages->package->squidextnoauth->configuration->settings</configpath> <fields> <field> <fielddescr>No Authentication Defined</fielddescr> <fieldname>no_auth</fieldname> + <type>text</type> </field> </fields> diff --git a/packages/squid/squid_nac.xml b/packages/squid/squid_nac.xml index 4e68c062..435671a2 100644 --- a/packages/squid/squid_nac.xml +++ b/packages/squid/squid_nac.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -44,9 +45,10 @@ <description>Describe your package here</description> <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> - <include_file>squid.inc</include_file> <name>squidnac</name> + <version>none</version> <title>Proxy server: Access control</title> + <include_file>squid.inc</include_file> <tabs> <tab> <text>General settings</text> @@ -80,49 +82,49 @@ </tabs> <fields> <field> - <fieldname>allowed_subnets</fieldname> <fielddescr>Allowed subnets</fielddescr> + <fieldname>allowed_subnets</fieldname> <description>Enter each subnet on a new line that is allowed to use the proxy. The subnets must be expressed as CIDR ranges (e.g.: 192.168.1.0/24). Note that the proxy interface subnet is already an allowed subnet. All the other subnets won't be able to use the proxy.</description> <type>textarea</type> - <encoding>base64</encoding> - <rows>5</rows> <cols>50</cols> + <rows>5</rows> + <encoding>base64</encoding> </field> <field> - <fieldname>unrestricted_hosts</fieldname> <fielddescr>Unrestricted IPs</fielddescr> + <fieldname>unrestricted_hosts</fieldname> <description>Enter each unrestricted IP address on a new line that is not to be filtered out by the other access control directives set in this page.</description> <type>textarea</type> - <encoding>base64</encoding> - <rows>5</rows> <cols>50</cols> + <rows>5</rows> + <encoding>base64</encoding> </field> <field> - <fieldname>banned_hosts</fieldname> <fielddescr>Banned host addresses</fielddescr> + <fieldname>banned_hosts</fieldname> <description>Enter each IP address on a new line that is not to be allowed to use the proxy.</description> <type>textarea</type> - <encoding>base64</encoding> - <rows>5</rows> <cols>50</cols> + <rows>5</rows> + <encoding>base64</encoding> </field> <field> - <fieldname>whitelist</fieldname> <fielddescr>Whitelist</fielddescr> + <fieldname>whitelist</fieldname> <description>Enter each destination domain on a new line that will be accessable to the users that are allowed to use the proxy.</description> <type>textarea</type> - <encoding>base64</encoding> - <rows>5</rows> <cols>50</cols> + <rows>5</rows> + <encoding>base64</encoding> </field> <field> - <fieldname>blacklist</fieldname> <fielddescr>Blacklist</fielddescr> + <fieldname>blacklist</fieldname> <description>Enter each destination domain on a new line that will be blocked to the users that are allowed to use the proxy.</description> <type>textarea</type> - <encoding>base64</encoding> - <rows>5</rows> <cols>50</cols> + <rows>5</rows> + <encoding>base64</encoding> </field> </fields> <custom_php_validation_command> diff --git a/packages/squid/squid_ng.xml b/packages/squid/squid_ng.xml index 4c9667af..5949606e 100644 --- a/packages/squid/squid_ng.xml +++ b/packages/squid/squid_ng.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -45,12 +46,11 @@ <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> <name>squid</name> + <version>2.5.12_4</version> <title>Services: Proxy Server</title> <category>Security</category> - <version>2.5.12_4</version> - <include_file>/usr/local/pkg/squid_ng.inc</include_file> - <configpath>installedpackages->package->squidng->configuration->settings</configpath> <aftersaveredirect>/pkg_edit.php?xml=squid_ng.xml&id=0</aftersaveredirect> + <include_file>/usr/local/pkg/squid_ng.inc</include_file> <menu> <name>Squid</name> <tooltiptext>Modify settings for Proxy Server</tooltiptext> @@ -67,6 +67,38 @@ <name>squid</name> <rcfile>squid.sh</rcfile> </service> + <tabs> + <tab> + <text>General Settings</text> + <url>/pkg_edit.php?xml=squid.xml&id=0</url> + <active/> + </tab> + <tab> + <text>Upstream Proxy</text> + <url>/pkg_edit.php?xml=squid_upstream.xml&id=0</url> + </tab> + <tab> + <text>Cache Mgmt</text> + <url>/pkg_edit.php?xml=squid_cache.xml&id=0</url> + </tab> + <tab> + <text>Network Access Control</text> + <url>/pkg_edit.php?xml=squid_nac.xml&id=0</url> + </tab> + <tab> + <text>Traffic Mgmt</text> + <url>/pkg_edit.php?xml=squid_traffic.xml&id=0</url> + </tab> + <tab> + <text>Auth Settings</text> + <url>/pkg_edit.php?xml=squid_auth.xml&id=0</url> + </tab> + <tab> + <text>Extended Auth Settings</text> + <url>/pkg_edit.php?xml=squid_extauth.xml&id=0</url> + </tab> + </tabs> + <configpath>installedpackages->package->squidng->configuration->settings</configpath> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> <chmod>0755</chmod> @@ -107,37 +139,6 @@ <chmod>0755</chmod> <item>http://www.pfsense.com/packages/config/squid/squid_extauth.xml</item> </additional_files_needed> - <tabs> - <tab> - <text>General Settings</text> - <url>/pkg_edit.php?xml=squid.xml&id=0</url> - <active/> - </tab> - <tab> - <text>Upstream Proxy</text> - <url>/pkg_edit.php?xml=squid_upstream.xml&id=0</url> - </tab> - <tab> - <text>Cache Mgmt</text> - <url>/pkg_edit.php?xml=squid_cache.xml&id=0</url> - </tab> - <tab> - <text>Network Access Control</text> - <url>/pkg_edit.php?xml=squid_nac.xml&id=0</url> - </tab> - <tab> - <text>Traffic Mgmt</text> - <url>/pkg_edit.php?xml=squid_traffic.xml&id=0</url> - </tab> - <tab> - <text>Auth Settings</text> - <url>/pkg_edit.php?xml=squid_auth.xml&id=0</url> - </tab> - <tab> - <text>Extended Auth Settings</text> - <url>/pkg_edit.php?xml=squid_extauth.xml&id=0</url> - </tab> - </tabs> <fields> <field> <fielddescr>Proxy Listening Interface</fielddescr> @@ -176,33 +177,33 @@ <type>checkbox</type> </field> <field> - <combinefieldsend>true</combinefieldsend> <fielddescr>Proxy Port</fielddescr> <fieldname>proxy_port</fieldname> <description>This is the port the Proxy Server will listen for client requests on. The default is 3128.</description> - <size>4</size> <type>input</type> + <size>4</size> + <combinefieldsend>true</combinefieldsend> </field> <field> <fielddescr>ICP Port</fielddescr> <fieldname>icp_port</fieldname> <description>This is the port the Proxy Server will send and receive ICP queries to and from neighbor caches. The default value is 0, which means this function is disabled.</description> - <size>4</size> <type>input</type> + <size>4</size> </field> <field> <fielddescr>Visible Hostname</fielddescr> <fieldname>visible_hostname</fieldname> <description>This URL is displayed on the Proxy Server error messages.</description> - <size>35</size> <type>input</type> + <size>35</size> </field> <field> <fielddescr>Cache Administrator E-Mail</fielddescr> <fieldname>cache_admin_email</fieldname> <description>This E-Mail address is displayed on the Proxy Server error messages.</description> - <size>35</size> <type>input</type> + <size>35</size> </field> <field> <fielddescr>Error Messages Language</fielddescr> diff --git a/packages/squid/squid_traffic.xml b/packages/squid/squid_traffic.xml index bfad2c06..1556be66 100644 --- a/packages/squid/squid_traffic.xml +++ b/packages/squid/squid_traffic.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -44,9 +45,10 @@ <description>Describe your package here</description> <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> - <include_file>squid.inc</include_file> <name>squidtraffic</name> + <version>none</version> <title>Proxy server: Traffic management</title> + <include_file>squid.inc</include_file> <tabs> <tab> <text>General settings</text> @@ -80,66 +82,66 @@ </tabs> <fields> <field> - <fieldname>max_download_size</fieldname> <fielddescr>Maximum download size</fielddescr> + <fieldname>max_download_size</fieldname> <description>Limit the maximum total download size to the size specified here (in kilobytes). Set to 0 to disable.</description> - <default_value>0</default_value> - <required/> <type>input</type> + <required/> + <default_value>0</default_value> </field> <field> - <fieldname>max_upload_size</fieldname> <fielddescr>Maximum upload size</fielddescr> + <fieldname>max_upload_size</fieldname> <description>Limit the maximum total upload size to the size specified here (in kilobytes). Set to 0 to disable.</description> - <default_value>0</default_value> - <required/> <type>input</type> + <required/> + <default_value>0</default_value> </field> <field> - <fieldname>overall_throttling</fieldname> <fielddescr>Overall bandwidth throttling</fielddescr> + <fieldname>overall_throttling</fieldname> <description>This value specifies (in kilobytes per second) the bandwidth throttle for downloads. Users will gradually have their download speed increased according to this value. Set to 0 to disable bandwidth throttling.</description> - <default_value>0</default_value> - <required/> <type>input</type> + <required/> + <default_value>0</default_value> </field> <field> - <fieldname>perhost_throttling</fieldname> <fielddescr>Per-host throttling</fielddescr> + <fieldname>perhost_throttling</fieldname> <description>This value specifies the download throttling per host. Set to 0 to disable this.</description> - <default_value>0</default_value> - <required/> <type>input</type> + <required/> + <default_value>0</default_value> </field> <field> - <fieldname>throttle_specific</fieldname> <fielddescr>Throttle only specific extensions</fielddescr> + <fieldname>throttle_specific</fieldname> <description>Leave this checked to be able to choose the extensions that throttling will be applied to. Otherwise, all files will be throttled.</description> - <default_value>on</default_value> <type>checkbox</type> <enablefields>throttle_binaries,throttle_cdimages,throttle_multimedia,throttle_others</enablefields> + <default_value>on</default_value> </field> <field> - <fieldname>throttle_binaries</fieldname> <fielddescr>Throttle binary files</fielddescr> + <fieldname>throttle_binaries</fieldname> <description>Check this to apply bandwidth throttle to binary files. This includes compressed archives and executables.</description> <type>checkbox</type> </field> <field> - <fieldname>throttle_cdimages</fieldname> <fielddescr>Throttle CD images</fielddescr> + <fieldname>throttle_cdimages</fieldname> <description>Check this to apply bandwidth throttle to CD image files.</description> <type>checkbox</type> </field> <field> - <fieldname>throttle_multimedia</fieldname> <fielddescr>Throttle multimedia files</fielddescr> + <fieldname>throttle_multimedia</fieldname> <description>Check this to apply bandwidth throttle to multimedia files, such as movies or songs.</description> <type>checkbox</type> </field> <field> - <fieldname>throttle_others</fieldname> <fielddescr>Throttle other extensions</fielddescr> + <fieldname>throttle_others</fieldname> <description>Comma-separated list of extensions to apply bandwidth throttle to.</description> <type>input</type> <size>60</size> diff --git a/packages/squid/squid_upstream.xml b/packages/squid/squid_upstream.xml index 6abac9cf..1102c672 100644 --- a/packages/squid/squid_upstream.xml +++ b/packages/squid/squid_upstream.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -44,9 +45,10 @@ <description>Describe your package here</description> <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> - <include_file>squid.inc</include_file> <name>squidupstream</name> + <version>none</version> <title>Proxy server: Upstream proxy settings</title> + <include_file>squid.inc</include_file> <tabs> <tab> <text>General settings</text> @@ -83,9 +85,9 @@ <fielddescr>Enable forwarding</fielddescr> <fieldname>proxy_forwarding</fieldname> <description>This option enables the proxy server to forward requests to an upstream server.</description> - <required/> <type>checkbox</type> <enablefields>proxy_addr,proxy_port,icp_port,username,password</enablefields> + <required/> </field> <field> <fielddescr>Hostname</fielddescr> @@ -97,17 +99,17 @@ <fielddescr>TCP port</fielddescr> <fieldname>proxy_port</fieldname> <description>Enter the port to use to connect to the upstream proxy.</description> - <default_value>3128</default_value> <type>input</type> <size>5</size> + <default_value>3128</default_value> </field> <field> <fielddescr>ICP port</fielddescr> <fieldname>icp_port</fieldname> <description>Enter the port to connect to the upstream proxy for the ICP protocol. Use port number 7 to disable ICP communication between the proxies.</description> - <default_value>7</default_value> <type>input</type> <size>5</size> + <default_value>7</default_value> </field> <field> <fielddescr>Username</fielddescr> diff --git a/packages/squid/squid_users.xml b/packages/squid/squid_users.xml index 0854007c..34260817 100644 --- a/packages/squid/squid_users.xml +++ b/packages/squid/squid_users.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -44,9 +45,10 @@ <description>Describe your package here</description> <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> - <include_file>squid.inc</include_file> <name>squidusers</name> + <version>none</version> <title>Proxy server: Local users</title> + <include_file>squid.inc</include_file> <delete_string>A proxy server user has been deleted.</delete_string> <addedit_string>A proxy server user has been created/modified.</addedit_string> <tabs> @@ -82,32 +84,32 @@ </tabs> <adddeleteeditpagefields> <columnitem> - <fieldname>username</fieldname> <fielddescr>Username</fielddescr> + <fieldname>username</fieldname> </columnitem> <columnitem> - <fieldname>description</fieldname> <fielddescr>Description</fielddescr> + <fieldname>description</fieldname> </columnitem> </adddeleteeditpagefields> <fields> <field> - <fieldname>username</fieldname> <fielddescr>Username</fielddescr> + <fieldname>username</fieldname> <description>Enter the username here.</description> - <required/> <type>input</type> + <required/> </field> <field> - <fieldname>password</fieldname> <fielddescr>Password</fielddescr> + <fieldname>password</fieldname> <description>Enter the password here.</description> - <required/> <type>password</type> + <required/> </field> <field> - <fieldname>description</fieldname> <fielddescr>Description</fielddescr> + <fieldname>description</fieldname> <description>You may enter a description here for your reference (not parsed).</description> <type>input</type> </field> diff --git a/packages/sshterm/sshterm.xml b/packages/sshterm/sshterm.xml index e3ef219d..80907d0a 100644 --- a/packages/sshterm/sshterm.xml +++ b/packages/sshterm/sshterm.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -47,18 +48,7 @@ <name>sshterm</name> <version>1.0</version> <title>Diagnostics: Shell</title> - - <additional_files_needed> - <prefix>/usr/local/www/</prefix> - <chmod>0755</chmod> - <item>http://www.pfsense.org/packages/config/sshterm/diag_shell_head.php</item> - </additional_files_needed> - <additional_files_needed> - <prefix>/usr/local/www/</prefix> - <chmod>0755</chmod> - <item>http://www.pfsense.org/packages/config/sshterm/diag_shell_releng.php</item> - </additional_files_needed> - + <aftersaveredirect /> <!-- Menu is where this packages menu will appear --> <menu> <name>Shell</name> @@ -71,13 +61,22 @@ items will be stored in that location --> <configpath>['installedpackages']['sshterm']['config']</configpath> + <additional_files_needed> + <prefix>/usr/local/www/</prefix> + <chmod>0755</chmod> + <item>http://www.pfsense.org/packages/config/sshterm/diag_shell_head.php</item> + </additional_files_needed> + <additional_files_needed> + <prefix>/usr/local/www/</prefix> + <chmod>0755</chmod> + <item>http://www.pfsense.org/packages/config/sshterm/diag_shell_releng.php</item> + </additional_files_needed> <!-- fields gets invoked when the user adds or edits a item. the following items will be parsed and rendered for the user as a gui with input, and selectboxes. --> <fields /> - <aftersaveredirect /> <custom_php_command_before_form> </custom_php_command_before_form> <custom_delete_php_command> diff --git a/packages/test_package/test_package.xml b/packages/test_package/test_package.xml index 66b3816d..192a2d54 100644 --- a/packages/test_package/test_package.xml +++ b/packages/test_package/test_package.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -44,15 +45,48 @@ <description>Describe your package here</description> <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> - <title>Services: Snort</title> <name>Snort</name> <version>2.6.0.2</version> + <title>Services: Snort</title> + <include_file>/usr/local/pkg/snort.inc</include_file> <menu> <name>Snort</name> <tooltiptext>Setup snort specific settings</tooltiptext> <section>Services</section> <url>/pkg_edit.php?xml=snort.xml&id=0</url> </menu> + <service> + <name>snort</name> + <rcfile>snort.sh</rcfile> + <executable>snort</executable> + </service> + <tabs> + <tab> + <text>Snort Settings</text> + <url>/pkg_edit.php?xml=snort.xml&id=0</url> + <active/> + </tab> + <tab> + <text>Update Snort Rules</text> + <url>/snort_download_rules.php</url> + </tab> + <tab> + <text>Snort Rulesets</text> + <url>/snort_rulesets.php</url> + </tab> + <tab> + <text>Snort Blocked</text> + <url>/snort_blocked.php</url> + </tab> + <tab> + <text>Snort Whitelist</text> + <url>/pkg.php?xml=snort_whitelist.xml</url> + </tab> + <tab> + <text>Snort Alerts</text> + <url>/snort_alerts.php</url> + </tab> + </tabs> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> <chmod>077</chmod> @@ -98,48 +132,15 @@ <chmod>077</chmod> <item>http://www.pfsense.com/packages/config/snort/snort_dynamic_ip_reload.php</item> </additional_files_needed> - <service> - <name>snort</name> - <rcfile>snort.sh</rcfile> - <executable>snort</executable> - </service> - <include_file>/usr/local/pkg/snort.inc</include_file> - <tabs> - <tab> - <text>Snort Settings</text> - <url>/pkg_edit.php?xml=snort.xml&id=0</url> - <active/> - </tab> - <tab> - <text>Update Snort Rules</text> - <url>/snort_download_rules.php</url> - </tab> - <tab> - <text>Snort Rulesets</text> - <url>/snort_rulesets.php</url> - </tab> - <tab> - <text>Snort Blocked</text> - <url>/snort_blocked.php</url> - </tab> - <tab> - <text>Snort Whitelist</text> - <url>/pkg.php?xml=snort_whitelist.xml</url> - </tab> - <tab> - <text>Snort Alerts</text> - <url>/snort_alerts.php</url> - </tab> - </tabs> <fields> <field> <fielddescr>Interface</fielddescr> <fieldname>iface_array</fieldname> <description>Select all WAN type interfaces</description> + <type>interfaces_selection</type> + <size>3</size> <value>lan</value> <multiple>true</multiple> - <size>3</size> - <type>interfaces_selection</type> </field> <field> <fielddescr>Performance</fielddescr> @@ -148,33 +149,33 @@ <type>select</type> <options> <option> - <value>lowmem</value> <name>lowmem</name> + <value>lowmem</value> </option> <option> - <value>ac-std</value> <name>ac-std</name> + <value>ac-std</value> </option> <option> - <value>ac</value> <name>ac</name> + <value>ac</value> </option> <option> - <value>ac-banded</value> <name>ac-banded</name> + <value>ac-banded</value> </option> <option> - <value>ac-sparsebands</value> <name>ac-sparsebands</name> + <value>ac-sparsebands</value> </option> <option> - <value>mwm</value> <name>mwm</name> + <value>mwm</value> </option> <option> - <value>acs</value> <name>acs</name> + <value>acs</value> </option> </options> </field> @@ -182,9 +183,9 @@ <fielddescr>Oinkmaster code</fielddescr> <fieldname>oinkmastercode</fieldname> <description>Obtain a snort.org Oinkmaster code and paste here.</description> - <value></value> <type>input</type> <size>60</size> + <value></value> </field> <field> <fielddescr>Block offenders</fielddescr> @@ -200,13 +201,13 @@ <type>checkbox</type> </field> </fields> - <custom_php_install_command> - sync_package_snort_reinstall(); - </custom_php_install_command> <custom_add_php_command> sync_package_snort(); </custom_add_php_command> - <custom_php_resync_command> + <custom_php_resync_config_command> sync_package_snort(); - </custom_php_resync_command> + </custom_php_resync_config_command> + <custom_php_install_command> + sync_package_snort_reinstall(); + </custom_php_install_command> </packagegui>
\ No newline at end of file diff --git a/packages/tinydns/tinydns.xml b/packages/tinydns/tinydns.xml index b4aaa4fe..ac9359c5 100644 --- a/packages/tinydns/tinydns.xml +++ b/packages/tinydns/tinydns.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -46,8 +47,9 @@ <faq>Currently there are no FAQ items provided.</faq> <name>tinydns</name> <version>1.0</version> - <configpath>installedpackages->package->tinydns</configpath> <title>DNS Cache-Server: Settings</title> + <aftersaveredirect>/pkg_edit.php?xml=tinydns.xml&id=0</aftersaveredirect> + <include_file>/usr/local/pkg/tinydns.inc</include_file> <menu> <name>DNS Servers</name> <tooltiptext></tooltiptext> @@ -81,7 +83,7 @@ <url>/pkg_edit.php?xml=tinydns_sync.xml&id=0</url> </tab> </tabs> - <aftersaveredirect>/pkg_edit.php?xml=tinydns.xml&id=0</aftersaveredirect> + <configpath>installedpackages->package->tinydns</configpath> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> <chmod>077</chmod> @@ -137,31 +139,6 @@ <chmod>077</chmod> <item>http://www.pfsense.com/packages/config/tinydns/tinydns_sync.xml</item> </additional_files_needed> - <custom_php_install_command> - tinydns_custom_php_install_command(); - </custom_php_install_command> - <custom_php_deinstall_command> - tinydns_custom_php_deinstall_command(); - </custom_php_deinstall_command> - <custom_add_php_command> - tinydns_custom_php_changeip_command(); - tinydns_custom_php_install_command(); - tinydns_create_zone_file(); - tinydns_setup_ping_items(); - </custom_add_php_command> - <custom_php_resync_config_command> - tinydns_custom_php_changeip_command(); - tinydns_custom_php_install_command(); - tinydns_create_zone_file(); - tinydns_setup_ping_items(); - </custom_php_resync_config_command> - <custom_delete_php_command> - tinydns_custom_php_changeip_command(); - tinydns_custom_php_install_command(); - tinydns_create_zone_file(); - tinydns_setup_ping_items(); - </custom_delete_php_command> - <include_file>/usr/local/pkg/tinydns.inc</include_file> <fields> <field> <fielddescr>Enable DNS Forwarders</fielddescr> @@ -182,57 +159,81 @@ <type>checkbox</type> </field> <field> - <fieldname>ipaddress</fieldname> <fielddescr>IP Address</fielddescr> + <fieldname>ipaddress</fieldname> <description>Bind TinyDNS to this IP address. Enable DNS Forwarders bind TinyDNS to the LAN IP.</description> <type>input</type> </field> <field> - <fieldname>refreshinterval</fieldname> <fielddescr>Refresh Interval</fielddescr> + <fieldname>refreshinterval</fieldname> <description>Controls how often the monitoring ip adresses are polled</description> <type>input</type> </field> <field> - <fieldname>syncxmlrpc</fieldname> <fielddescr>XMLRPC Sync</fielddescr> + <fieldname>syncxmlrpc</fieldname> <description>Sync TinyDNS configuration to backup firewalls</description> <type>checkbox</type> </field> <field> - <fieldname>minsegment</fieldname> <fielddescr>Minimum segment size</fielddescr> + <fieldname>minsegment</fieldname> <description>Recommended size: 10240 or larger.</description> <type>input</type> <value>10240</value> </field> <field> - <fieldname>maxfilesize</fieldname> <fielddescr>Maximum file size</fielddescr> + <fieldname>maxfilesize</fieldname> <description>Recommended size: 10240 or larger.</description> <type>input</type> <value>10240</value> </field> <field> - <fieldname>maxsegment</fieldname> <fielddescr>Max Segment size</fielddescr> + <fieldname>maxsegment</fieldname> <description>Recommended size: 20480 or larger.</description> <type>input</type> <value>20480</value> </field> <field> - <fieldname>maxfd</fieldname> <fielddescr>Maximum file descriptors</fielddescr> + <fieldname>maxfd</fieldname> <description>Recommended size: 100 or larger.</description> <type>input</type> <value>100</value> </field> <field> - <fieldname>maxchild</fieldname> <fielddescr>Maximum children processes</fielddescr> + <fieldname>maxchild</fieldname> <description>Recommended size: 40 or larger.</description> <type>input</type> <value>40</value> </field> </fields> + <custom_delete_php_command> + tinydns_custom_php_changeip_command(); + tinydns_custom_php_install_command(); + tinydns_create_zone_file(); + tinydns_setup_ping_items(); + </custom_delete_php_command> + <custom_add_php_command> + tinydns_custom_php_changeip_command(); + tinydns_custom_php_install_command(); + tinydns_create_zone_file(); + tinydns_setup_ping_items(); + </custom_add_php_command> + <custom_php_resync_config_command> + tinydns_custom_php_changeip_command(); + tinydns_custom_php_install_command(); + tinydns_create_zone_file(); + tinydns_setup_ping_items(); + </custom_php_resync_config_command> + <custom_php_install_command> + tinydns_custom_php_install_command(); + </custom_php_install_command> + <custom_php_deinstall_command> + tinydns_custom_php_deinstall_command(); + </custom_php_deinstall_command> </packagegui> diff --git a/packages/tinydns/tinydns_domains.xml b/packages/tinydns/tinydns_domains.xml index 2e9213d6..2a7bf6e6 100644 --- a/packages/tinydns/tinydns_domains.xml +++ b/packages/tinydns/tinydns_domains.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -45,9 +46,9 @@ <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> <name>tinydnsdomains</name> - <configpath>installedpackages->package->tinydnsdomains</configpath> - <include_file>/usr/local/pkg/tinydns.inc</include_file> + <version>none</version> <title>TinyDNS: Domains</title> + <include_file>/usr/local/pkg/tinydns.inc</include_file> <tabs> <tab> <text>Settings</text> @@ -75,6 +76,7 @@ <url>/pkg_edit.php?xml=tinydns_sync.xml&id=0</url> </tab> </tabs> + <configpath>installedpackages->package->tinydnsdomains</configpath> <adddeleteeditpagefields> <columnitem> <fielddescr>Fully Qualified Domain Name (Hostname)</fielddescr> @@ -95,29 +97,29 @@ </adddeleteeditpagefields> <fields> <field> - <fieldname>hostname</fieldname> <fielddescr>Hostname or FQDN www.exampledomain.com</fielddescr> + <fieldname>hostname</fieldname> <description>The DNS server will supply Records for the Fully Qualified Domain Name that is entered</description> - <required/> <type>input</type> <size>35</size> + <required/> </field> <field> <fielddescr>Record type</fielddescr> <fieldname>recordtype</fieldname> <description>DNS Record types. A, PTR, MX, NS, SOA, TXT, CNAME</description> - <required/> <type>select</type> <size>1</size> + <required/> <options> - <option><value></value><name></name></option> - <option><value>A</value><name>A</name></option> - <option><value>MX</value><name>MX</name></option> - <option><value>NS</value><name>NS</name></option> - <option><value>SOA</value><name>SOA</name></option> - <option><value>PTR</value><name>PTR</name></option> - <option><value>CNAME</value><name>CNAME</name></option> - <option><value>TXT</value><name>TXT</name></option> + <option><name></name><value></value></option> + <option><name>A</name><value>A</value></option> + <option><name>MX</name><value>MX</value></option> + <option><name>NS</name><value>NS</value></option> + <option><name>SOA</name><value>SOA</value></option> + <option><name>PTR</name><value>PTR</value></option> + <option><name>CNAME</name><value>CNAME</value></option> + <option><name>TXT</name><value>TXT</value></option> </options> </field> <field> @@ -127,32 +129,34 @@ <type>checkbox</type> </field> <field> - <fieldname>ipaddress</fieldname> <fielddescr> FQDN or IP Address</fielddescr> + <fieldname>ipaddress</fieldname> <description>IP Address for A Records. FQDN or Hostname for SOA, PTR, CNAME Records. For NS Records an IP:FQDN</description> - <required/> <type>input</type> <size>40</size> + <required/> </field> <field> - <fieldname>ttl</fieldname> <fielddescr>DNS record time to live</fielddescr> + <fieldname>ttl</fieldname> <type>input</type> <size>35</size> </field> <field> - <fieldname>monitorip</fieldname> <fielddescr>IP to ping to ensure service is up</fielddescr> + <fieldname>monitorip</fieldname> <type>input</type> <size>35</size> </field> <field> - <fieldname>threshhold</fieldname> <fielddescr>Time in minutes before DNS switches to backup host</fielddescr> + <fieldname>threshhold</fieldname> <type>input</type> <size>35</size> </field> <field> + <fielddescr>none</fielddescr> + <fieldname>none</fieldname> <type>rowhelper</type> <rowhelper> <rowhelperfield> @@ -192,14 +196,14 @@ </rowhelper> </field> </fields> - <custom_add_php_command> - tinydns_create_zone_file(); - tinydns_setup_ping_items(); - </custom_add_php_command> <custom_delete_php_command> tinydns_create_zone_file(); tinydns_setup_ping_items(); </custom_delete_php_command> + <custom_add_php_command> + tinydns_create_zone_file(); + tinydns_setup_ping_items(); + </custom_add_php_command> <custom_php_resync_config_command> tinydns_create_zone_file(); tinydns_setup_ping_items(); diff --git a/packages/tinydns/tinydns_sync.xml b/packages/tinydns/tinydns_sync.xml index 2097acc0..2156aaba 100644 --- a/packages/tinydns/tinydns_sync.xml +++ b/packages/tinydns/tinydns_sync.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> @@ -46,11 +47,7 @@ <faq>Currently there are no FAQ items provided.</faq> <name>tinydnssync</name> <version>1.0</version> - <configpath>installedpackages->package->tinydns</configpath> <title>TinyDNS: Manual Sync</title> - <custom_php_resync_config_command> - tinydns_do_xmlrpc_sync($_POST['ipaddress'], $_POST['password']); - </custom_php_resync_config_command> <include_file>/usr/local/pkg/tinydns.inc</include_file> <tabs> <tab> @@ -79,18 +76,22 @@ <active/> </tab> </tabs> + <configpath>installedpackages->package->tinydns</configpath> <fields> <field> - <fieldname>ipaddress</fieldname> <fielddescr>IP Address</fielddescr> + <fieldname>ipaddress</fieldname> <description>The IP address that TinyDNS will Sync its data to.</description> <type>input</type> </field> <field> - <fieldname>password</fieldname> <fielddescr>Password</fielddescr> + <fieldname>password</fieldname> <description>Admin password on remote firewall to faciliate sync</description> <type>password</type> </field> </fields> + <custom_php_resync_config_command> + tinydns_do_xmlrpc_sync($_POST['ipaddress'], $_POST['password']); + </custom_php_resync_config_command> </packagegui> |