aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/arpwatch.xml11
-rw-r--r--packages/assp.xml5
-rw-r--r--packages/clamav.xml44
-rw-r--r--packages/clamsmtp.xml18
-rw-r--r--packages/doorman.xml28
-rw-r--r--packages/doormanusers.xml2
-rw-r--r--packages/freeradius.xml65
-rw-r--r--packages/freeradiusclients.xml10
-rw-r--r--packages/freeradiussettings.xml8
-rw-r--r--packages/frickin.xml2
-rw-r--r--packages/havp.xml13
-rw-r--r--packages/havp_blacklist.xml13
-rw-r--r--packages/havp_trans_exclude.xml13
-rw-r--r--packages/havp_whitelist.xml13
-rw-r--r--packages/hula.xml25
-rw-r--r--packages/ifdepd.xml7
-rw-r--r--packages/ifstated.xml27
-rw-r--r--packages/iperf.xml3
-rw-r--r--packages/iperfserver.xml3
-rw-r--r--packages/mtr-nox11.xml9
-rw-r--r--packages/netio.xml3
-rw-r--r--packages/netioserver.xml3
-rw-r--r--packages/ntop/ntop.xml13
-rw-r--r--packages/p3scan.xml20
-rw-r--r--packages/per-user-bandwidth-distribution.xml13
-rw-r--r--packages/pfstat.xml96
-rw-r--r--packages/phpmrss.xml1
-rw-r--r--packages/postfix.xml25
-rw-r--r--packages/powerdns.xml125
-rw-r--r--packages/pure-ftpd.xml47
-rw-r--r--packages/pure-ftpdsettings.xml14
-rw-r--r--packages/sassassin.xml72
-rw-r--r--packages/sassassin_bl.xml12
-rw-r--r--packages/sassassin_wl.xml12
-rw-r--r--packages/schema/packages.dtd38
-rw-r--r--packages/siproxd.xml27
-rw-r--r--packages/siproxdusers.xml7
-rw-r--r--packages/spamd.xml62
-rw-r--r--packages/spamd_outlook.xml1
-rw-r--r--packages/spamd_settings.xml13
-rw-r--r--packages/spamd_whitelist.xml1
-rw-r--r--packages/squidGuard.xml5
-rw-r--r--packages/stunnel.xml41
-rw-r--r--packages/upclient.xml5
-rw-r--r--packages/viralator.xml4
-rw-r--r--packages/widentd.xml11
46 files changed, 542 insertions, 448 deletions
diff --git a/packages/arpwatch.xml b/packages/arpwatch.xml
index 9ac0a187..66c8cc5a 100644
--- a/packages/arpwatch.xml
+++ b/packages/arpwatch.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,8 @@
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>arpwatch</name>
- <title>arpwatch: Settings</title>
<version>2.1.a13</version>
- <configpath>installedpackages->package->$packagename->configuration->settings</configpath>
+ <title>arpwatch: Settings</title>
<aftersaveredirect>pkg_edit.php?xml=arpwatch.xml&amp;id=0</aftersaveredirect>
<menu>
<name>arpwatch</name>
@@ -72,6 +72,7 @@
<url>/arpwatch_reports.php</url>
</tab>
</tabs>
+ <configpath>installedpackages->package->$packagename->configuration->settings</configpath>
<additional_files_needed>
<prefix>/usr/local/www/</prefix>
<chmod>a+rx</chmod>
@@ -85,9 +86,6 @@
<type>interfaces_selection</type>
</field>
</fields>
- <custom_php_install_command>
- unlink_if_exists("/usr/local/etc/rc.d/arpwatch.sh");
- </custom_php_install_command>
<custom_php_global_functions>
function sync_package_arpwatch() {
global $config;
@@ -111,5 +109,8 @@
<custom_add_php_command>
sync_package_arpwatch();
</custom_add_php_command>
+ <custom_php_install_command>
+ unlink_if_exists("/usr/local/etc/rc.d/arpwatch.sh");
+ </custom_php_install_command>
</packagegui>
diff --git a/packages/assp.xml b/packages/assp.xml
index 0fcfad4d..94f35b2e 100644
--- a/packages/assp.xml
+++ b/packages/assp.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,15 @@
<description>Describe your package here</description>
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
- <title>Services: ASSP</title>
<name>assp</name>
<version>0.1.0</version>
+ <title>Services: ASSP</title>
<!-- Menu is where this packages menu will appear -->
<menu>
<name>ASSP</name>
<tooltiptext>Access ASSP</tooltiptext>
- <url>http://$myurl:55555</url>
<section>Services</section>
+ <url>http://$myurl:55555</url>
</menu>
<service>
<name>assp</name>
diff --git a/packages/clamav.xml b/packages/clamav.xml
index 017c8e80..483a32a6 100644
--- a/packages/clamav.xml
+++ b/packages/clamav.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,10 @@
<description>Describe your package here</description>
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
+ <name>clamav</name>
+ <version>none</version>
+ <title>Antivirus</title>
<include_file>clamav.inc</include_file>
-
- <!-- Installation -->
- <additional_files_needed>
- <item>http://www.pfsense.org/packages/config/clamav.inc</item>
- </additional_files_needed>
- <custom_php_install_command>
- clamav_install_command();
- </custom_php_install_command>
<menu>
<name>Antivirus</name>
<tooltiptext>Configure antivirus settings</tooltiptext>
@@ -61,60 +57,59 @@
</menu>
<service>
<name>ClamAV</name>
- <description>The ClamAV antivirus.</description>
<rcfile>clamd.sh</rcfile>
<executable>clamd</executable>
+ <description>The ClamAV antivirus.</description>
</service>
<service>
<name>FreshClam</name>
- <description>A daemon that periodically updates the ClamAV virus database.</description>
<rcfile>freshclam.sh</rcfile>
<executable>freshclam</executable>
+ <description>A daemon that periodically updates the ClamAV virus database.</description>
</service>
-
- <!-- Interface -->
- <name>clamav</name>
- <title>Antivirus</title>
+ <additional_files_needed>
+ <item>http://www.pfsense.org/packages/config/clamav.inc</item>
+ </additional_files_needed>
<fields>
<field>
- <fieldname>expert</fieldname>
<fielddescr>Expert mode</fielddescr>
+ <fieldname>expert</fieldname>
<description>This enables the expert mode. Don't check this unless you are sure of what you are doing.</description>
<type>checkbox</type>
<enablefields>brokenexec,scan_pe,scan_ole2,scan_html,scan_archive</enablefields>
<required/>
</field>
<field>
- <fieldname>brokenexec</fieldname>
<fielddescr>Detect broken executables</fielddescr>
+ <fieldname>brokenexec</fieldname>
<description>Try to detect broken executables.</description>
<type>checkbox</type>
<default_value>on</default_value>
</field>
<field>
- <fieldname>scan_pe</fieldname>
<fielddescr>Scan PE</fielddescr>
+ <fieldname>scan_pe</fieldname>
<description>Scan files in 32-bit Windows' Portable Executable format.</description>
<type>checkbox</type>
<default_value>on</default_value>
</field>
<field>
- <fieldname>scan_ole2</fieldname>
<fielddescr>Scan OLE2</fielddescr>
+ <fieldname>scan_ole2</fieldname>
<description>Scan Microsoft Office document macros.</description>
<type>checkbox</type>
<default_value>on</default_value>
</field>
<field>
- <fieldname>scan_html</fieldname>
<fielddescr>Scan HTML</fielddescr>
+ <fieldname>scan_html</fieldname>
<description>Perform HTML normalization and decryption of Microsoft Script Encoder code.</description>
<type>checkbox</type>
<default_value>on</default_value>
</field>
<field>
- <fieldname>scan_archive</fieldname>
<fielddescr>Scan archives</fielddescr>
+ <fieldname>scan_archive</fieldname>
<description>Try to uncompress archived files to scan their content.</description>
<type>checkbox</type>
<default_value>on</default_value>
@@ -123,10 +118,13 @@
<custom_php_command_before_form>
clamav_before_form(&amp;$pkg);
</custom_php_command_before_form>
- <custom_php_validation_command>
- clamav_validate_input($post, &amp;$input_errors);
- </custom_php_validation_command>
<custom_php_resync_config_command>
clamav_resync();
</custom_php_resync_config_command>
+ <custom_php_validation_command>
+ clamav_validate_input($post, &amp;$input_errors);
+ </custom_php_validation_command>
+ <custom_php_install_command>
+ clamav_install_command();
+ </custom_php_install_command>
</packagegui>
diff --git a/packages/clamsmtp.xml b/packages/clamsmtp.xml
index 896f602e..16bb5d6d 100644
--- a/packages/clamsmtp.xml
+++ b/packages/clamsmtp.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,22 +45,25 @@
<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>
<include_file>clamsmtp.inc</include_file>
+ <service>
+ <name>clamsmtp</name>
+ <rcfile>clamsmtp.sh</rcfile>
+ <executable>clamsmtpd</executable>
+ <description>SMTP virus scanner.</description>
+ </service>
<additional_files_needed>
<item>http://www.pfsense.org/packages/config/clamsmtp.inc</item>
</additional_files_needed>
<additional_files_needed>
- <item>http://www.pfsense.org/packages/All/clamsmtpd</item>
<prefix>/usr/local/bin/</prefix>
<chmod>0755</chmod>
+ <item>http://www.pfsense.org/packages/All/clamsmtpd</item>
</additional_files_needed>
<custom_php_install_command>
clamsmtp_install_command();
</custom_php_install_command>
- <service>
- <name>clamsmtp</name>
- <description>SMTP virus scanner.</description>
- <rcfile>clamsmtp.sh</rcfile>
- <executable>clamsmtpd</executable>
- </service>
</packagegui>
diff --git a/packages/doorman.xml b/packages/doorman.xml
index 8bac222b..64f35087 100644
--- a/packages/doorman.xml
+++ b/packages/doorman.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,6 +46,7 @@
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>doorman</name>
+ <version>none</version>
<title>doorman: Settings</title>
<aftersaveredirect>pkg_edit.php?xml=doorman.xml&amp;id=0</aftersaveredirect>
<menu>
@@ -61,7 +63,7 @@
</service>
<tabs>
<tab>
- <text>Settings</ext>
+ <text>Settings</text>
<url>/pkg_edit.php?xml=doorman.xml&amp;id=0</url>
<active/>
</tab>
@@ -70,10 +72,10 @@
<url>/pkg.php?xml=doormanusers.xml</url>
</tab>
</tabs>
+ <configpath>installedpackages->package->$packagename->configuration->settings</configpath>
<additional_files_needed>
<item>http://www.pfsense.com/packages/config/doormanusers.xml</item>
</additional_files_needed>
- <configpath>installedpackages->package->$packagename->configuration->settings</configpath>
<fields>
<field>
<fielddescr>Initial connection timeout</fielddescr>
@@ -109,20 +111,10 @@
<fielddescr>Listening port</fielddescr>
<fieldname>port</fieldname>
<description>Enter the port that doormand should listen on. (default 1001)</description>
- <value>1001</value>
<type>input</type>
+ <value>1001</value>
</field>
</fields>
- <custom_php_install_command>
- global $config;
- $start = "/usr/local/sbin/doormand -D &amp;";
- write_rcfile(array(
- "file" => "doorman.sh",
- "start" => $start,
- "stop" => "/usr/bin/killall doormand"
- )
- );
- </custom_php_install_command>
<custom_php_global_functions>
function sync_package_doorman() {
conf_mount_rw();
@@ -151,5 +143,15 @@
<custom_add_php_command>
sync_package_doorman();
</custom_add_php_command>
+ <custom_php_install_command>
+ global $config;
+ $start = "/usr/local/sbin/doormand -D &amp;";
+ write_rcfile(array(
+ "file" => "doorman.sh",
+ "start" => $start,
+ "stop" => "/usr/bin/killall doormand"
+ )
+ );
+ </custom_php_install_command>
</packagegui>
diff --git a/packages/doormanusers.xml b/packages/doormanusers.xml
index aa25e8cc..a1887b28 100644
--- a/packages/doormanusers.xml
+++ b/packages/doormanusers.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,6 +46,7 @@
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>doormanusers</name>
+ <version>none</version>
<title>Doorman: Users</title>
<menu>
<name>Doorman</name>
diff --git a/packages/freeradius.xml b/packages/freeradius.xml
index 49edbef4..322201b2 100644
--- a/packages/freeradius.xml
+++ b/packages/freeradius.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,31 +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>freeradius.inc</include_file>
+ <name>freeradius</name>
<version>1.1.2</version>
-
- <!-- Installation -->
- <additional_files_needed>
- <item>http://www.pfsense.org/packages/config/freeradiusclients.xml</item>
- <prefix>/usr/local/pkg/</prefix>
- <chmod>077</chmod>
- </additional_files_needed>
- <additional_files_needed>
- <item>http://www.pfsense.org/packages/config/freeradiussettings.xml</item>
- <prefix>/usr/local/pkg/</prefix>
- <chmod>077</chmod>
- </additional_files_needed>
- <additional_files_needed>
- <item>http://www.pfsense.org/packages/config/freeradius.inc</item>
- <prefix>/usr/local/pkg/</prefix>
- <chmod>077</chmod>
- </additional_files_needed>
- <custom_php_install_command>
- freeradius_install_command();
- </custom_php_install_command>
- <custom_php_deinstall_command>
- freeradius_deinstall_command();
- </custom_php_deinstall_command>
+ <title>FreeRADIUS: Users</title>
+ <include_file>freeradius.inc</include_file>
<menu>
<name>FreeRADIUS</name>
<tooltiptext>Modify FreeRADIUS users, clients, and settings.</tooltiptext>
@@ -77,14 +57,11 @@
</menu>
<service>
<name>FreeRADIUS</name>
- <description>The FreeRADIUS daemon.</description>
<rcfile>radiusd.sh</rcfile>
<executable>radiusd</executable>
+ <description>The FreeRADIUS daemon.</description>
</service>
- <!-- Interface -->
- <name>freeradius</name>
- <title>FreeRADIUS: Users</title>
<tabs>
<tab>
<text>Users</text>
@@ -100,6 +77,7 @@
<url>/pkg_edit.php?xml=freeradiussettings.xml&amp;id=0</url>
</tab>
</tabs>
+
<adddeleteeditpagefields>
<columnitem>
<fielddescr>Username</fielddescr>
@@ -110,24 +88,39 @@
<fieldname>description</fieldname>
</columnitem>
</adddeleteeditpagefields>
+ <additional_files_needed>
+ <prefix>/usr/local/pkg/</prefix>
+ <chmod>077</chmod>
+ <item>http://www.pfsense.org/packages/config/freeradiusclients.xml</item>
+ </additional_files_needed>
+ <additional_files_needed>
+ <prefix>/usr/local/pkg/</prefix>
+ <chmod>077</chmod>
+ <item>http://www.pfsense.org/packages/config/freeradiussettings.xml</item>
+ </additional_files_needed>
+ <additional_files_needed>
+ <prefix>/usr/local/pkg/</prefix>
+ <chmod>077</chmod>
+ <item>http://www.pfsense.org/packages/config/freeradius.inc</item>
+ </additional_files_needed>
<fields>
<field>
- <fieldname>username</fieldname>
<fielddescr>Username</fielddescr>
+ <fieldname>username</fieldname>
<description>Enter the username.</description>
- <required/>
<type>input</type>
+ <required/>
</field>
<field>
- <fieldname>password</fieldname>
<fielddescr>Password</fielddescr>
+ <fieldname>password</fieldname>
<description>Enter the password for this username.</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>
@@ -138,4 +131,10 @@
<custom_php_resync_config_command>
freeradius_users_resync();
</custom_php_resync_config_command>
+ <custom_php_install_command>
+ freeradius_install_command();
+ </custom_php_install_command>
+ <custom_php_deinstall_command>
+ freeradius_deinstall_command();
+ </custom_php_deinstall_command>
</packagegui>
diff --git a/packages/freeradiusclients.xml b/packages/freeradiusclients.xml
index 80d2cde0..e9417581 100644
--- a/packages/freeradiusclients.xml
+++ b/packages/freeradiusclients.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,6 +46,7 @@
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>freeradiusclients</name>
+ <version>none</version>
<title>FreeRADIUS: Clients</title>
<include_file>freeradius.inc</include_file>
<tabs>
@@ -78,29 +80,29 @@
</adddeleteeditpagefields>
<fields>
<field>
- <fieldname>client</fieldname>
<fielddescr>Client</fielddescr>
+ <fieldname>client</fieldname>
<description>Enter the client's IP address.</description>
<type>input</type>
<required/>
</field>
<field>
- <fieldname>shortname</fieldname>
<fielddescr>Shortname</fielddescr>
+ <fieldname>shortname</fieldname>
<description>Enter the client's shortname.</description>
<type>input</type>
<required/>
</field>
<field>
- <fieldname>sharedsecret</fieldname>
<fielddescr>Shared Secret</fielddescr>
+ <fieldname>sharedsecret</fieldname>
<description>Enter the client's shared secret here</description>
<type>password</type>
<required/>
</field>
<field>
- <fieldname>description</fieldname>
<fielddescr>Description</fielddescr>
+ <fieldname>description</fieldname>
<description>Enter the description of the user here</description>
<type>input</type>
</field>
diff --git a/packages/freeradiussettings.xml b/packages/freeradiussettings.xml
index 9b37c0c2..8e3cf812 100644
--- a/packages/freeradiussettings.xml
+++ b/packages/freeradiussettings.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,10 @@
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>freeradiussettings</name>
+ <version>none</version>
<title>FreeRADIUS: Settings</title>
- <include_file>freeradius.inc</include_file>
<aftersaveredirect>pkg_edit.php?xml=freeradiussettings.xml&amp;id=0</aftersaveredirect>
+ <include_file>freeradius.inc</include_file>
<tabs>
<tab>
<text>Users</text>
@@ -65,15 +67,15 @@
</tabs>
<fields>
<field>
- <fieldname>interface</fieldname>
<fielddescr>Listening Interface(s)</fielddescr>
+ <fieldname>interface</fieldname>
<description>Enter the desired listening interface here.</description>
<type>interfaces_selection</type>
<required/>
</field>
<field>
- <fieldname>port</fieldname>
<fielddescr>Port</fielddescr>
+ <fieldname>port</fieldname>
<description>Enter the port the RADIUS server will listen on. Leave blank to default to the system default, i.e., 1892.</description>
<type>input</type>
</field>
diff --git a/packages/frickin.xml b/packages/frickin.xml
index 4ee2262b..8f59bb8c 100644
--- a/packages/frickin.xml
+++ b/packages/frickin.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,6 +47,7 @@
<faq>Currently there are no FAQ items provided.</faq>
<name>frickin</name>
<version>1.2</version>
+ <title>none</title>
<configpath>installedpackages->package->$packagename->configuration->settings</configpath>
<additional_files_needed>
<prefix>/usr/local/bin/</prefix>
diff --git a/packages/havp.xml b/packages/havp.xml
index 469df69c..0dee82e3 100644
--- a/packages/havp.xml
+++ b/packages/havp.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,14 +48,14 @@
<name>havp</name>
<version>0.3</version>
<title>Havp: Settings</title>
- <include_file>/usr/local/pkg/havp.inc</include_file>
<aftersaveredirect>/pkg_edit.php?xml=havp.xml&amp;id=0</aftersaveredirect>
+ <include_file>/usr/local/pkg/havp.inc</include_file>
<menu>
<name>HAVP</name>
- <section>Services</section>
<tooltiptext>Modify HAVP settings.</tooltiptext>
- <url>/pkg_edit.php?xml=havp.xml&amp;id=0</url>
+ <section>Services</section>
<configfile>havp.xml</configfile>
+ <url>/pkg_edit.php?xml=havp.xml&amp;id=0</url>
</menu>
<service>
@@ -82,7 +83,7 @@
<url>/pkg.php?xml=havp_trans_exclude.xml</url>
</tab>
</tabs>
-
+ <configpath>['installedpackages']['havp]['config']</configpath>
<additional_files_needed>
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
@@ -114,8 +115,6 @@
<item>http://agni.linuxense.com/packages/config/havp.sh</item>
</additional_files_needed>
- <configpath>['installedpackages']['havp]['config']</configpath>
-
<fields>
<field>
<fielddescr>Server Number</fielddescr>
@@ -213,9 +212,9 @@
</field>
</fields>
+ <custom_php_resync_config_command> sync_package_havp(); </custom_php_resync_config_command>
<custom_php_install_command> havp_install_command(); </custom_php_install_command>
<custom_php_deinstall_command> havp_deinstall_command(); </custom_php_deinstall_command>
- <custom_php_resync_config_command> sync_package_havp(); </custom_php_resync_config_command>
</packagegui>
diff --git a/packages/havp_blacklist.xml b/packages/havp_blacklist.xml
index a3aa546f..aa82507a 100644
--- a/packages/havp_blacklist.xml
+++ b/packages/havp_blacklist.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>
@@ -75,12 +76,6 @@
</tab>
</tabs>
- <additional_files_needed>
- <prefix>/usr/local/pkg/</prefix>
- <chmod>0755</chmod>
- <item>http://agni.linuxense.com/packages/config/havp.inc</item>
- </additional_files_needed>
-
<configpath>['installedpackages']['havpblacklist']['config']</configpath>
<adddeleteeditpagefields>
@@ -94,6 +89,12 @@
</columnitem>
</adddeleteeditpagefields>
+ <additional_files_needed>
+ <prefix>/usr/local/pkg/</prefix>
+ <chmod>0755</chmod>
+ <item>http://agni.linuxense.com/packages/config/havp.inc</item>
+ </additional_files_needed>
+
<fields>
<field>
<fielddescr>Blocked URL</fielddescr>
diff --git a/packages/havp_trans_exclude.xml b/packages/havp_trans_exclude.xml
index 06698309..b04d168f 100644
--- a/packages/havp_trans_exclude.xml
+++ b/packages/havp_trans_exclude.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>
@@ -75,12 +76,6 @@
</tab>
</tabs>
- <additional_files_needed>
- <prefix>/usr/local/pkg/</prefix>
- <chmod>0755</chmod>
- <item>http://agni.linuxense.com/packages/config/havp.inc</item>
- </additional_files_needed>
-
<configpath>['installedpackages']['havptransexclude']['config']</configpath>
<adddeleteeditpagefields>
@@ -93,6 +88,12 @@
<fieldname>description</fieldname>
</columnitem>
</adddeleteeditpagefields>
+
+ <additional_files_needed>
+ <prefix>/usr/local/pkg/</prefix>
+ <chmod>0755</chmod>
+ <item>http://agni.linuxense.com/packages/config/havp.inc</item>
+ </additional_files_needed>
<fields>
<field>
diff --git a/packages/havp_whitelist.xml b/packages/havp_whitelist.xml
index 37d6c56b..ce64a838 100644
--- a/packages/havp_whitelist.xml
+++ b/packages/havp_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>
@@ -75,12 +76,6 @@
</tab>
</tabs>
- <additional_files_needed>
- <prefix>/usr/local/pkg/</prefix>
- <chmod>0755</chmod>
- <item>http://agni.linuxense.com/packages/config/havp.inc</item>
- </additional_files_needed>
-
<configpath>['installedpackages']['havpwhitelist']['config']</configpath>
<adddeleteeditpagefields>
@@ -93,6 +88,12 @@
<fieldname>description</fieldname>
</columnitem>
</adddeleteeditpagefields>
+
+ <additional_files_needed>
+ <prefix>/usr/local/pkg/</prefix>
+ <chmod>0755</chmod>
+ <item>http://agni.linuxense.com/packages/config/havp.inc</item>
+ </additional_files_needed>
<fields>
<field>
diff --git a/packages/hula.xml b/packages/hula.xml
index 662d9527..0270e8c5 100644
--- a/packages/hula.xml
+++ b/packages/hula.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,12 @@
<description>Describe your package here</description>
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
- <title>Services: Hula</title>
<name>hula</name>
<version>3.0</version>
- <donotsave>true</donotsave>
- <preoutput>yes</preoutput>
+ <title>Services: Hula</title>
<savetext>Change</savetext>
- <additional_files_needed>
- <item>http://www.pfsense.com/packages/All/hula.tgz</item>
- </additional_files_needed>
+ <preoutput>yes</preoutput>
+ <donotsave>true</donotsave>
<!-- Menu is where this packages menu will appear -->
<menu>
<name>Hula Setup</name>
@@ -72,6 +70,11 @@
<section>Services</section>
<url>http://$myurl:8080</url>
</menu>
+
+ <additional_files_needed>
+ <item>http://www.pfsense.com/packages/All/hula.tgz</item>
+ </additional_files_needed>
+
<!-- Do not save invokes a simple input menu and will not update
the configuration database. -->
<fields>
@@ -90,11 +93,6 @@
conf_mount_ro();
config_unlock();
</custom_add_php_command>
- <custom_php_deinstall_command>
- mwexec("/usr/bin/killall -9 hulamanager");
- rmdir_recursive("/usr/local/hula");
- unlink_if_exists("/usr/local/etc/rc.d/hula.sh");
- </custom_php_deinstall_command>
<custom_php_install_command>
$fout = fopen("/usr/local/etc/rc.d/hula.sh","w");
fwrite($fout, "#!/bin/sh\n\n");
@@ -103,4 +101,9 @@
fclose($fout);
chmod("/usr/local/etc/rc.d/hula.sh", 0755);
</custom_php_install_command>
+ <custom_php_deinstall_command>
+ mwexec("/usr/bin/killall -9 hulamanager");
+ rmdir_recursive("/usr/local/hula");
+ unlink_if_exists("/usr/local/etc/rc.d/hula.sh");
+ </custom_php_deinstall_command>
</packagegui>
diff --git a/packages/ifdepd.xml b/packages/ifdepd.xml
index 1fd7a6a0..009a3b73 100644
--- a/packages/ifdepd.xml
+++ b/packages/ifdepd.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>
@@ -80,7 +81,7 @@
<description>Enter a colon seperated list of interfaces to disable once one of the source interfaces loses connectivity. You must specify physical interface names.</description>
<type>input</type>
</field>
- </fields>
+ </fields>
<custom_php_global_functions>
function sync_package_ifdepd() {
conf_mount_rw();
@@ -110,8 +111,8 @@
<custom_add_php_command>
sync_package_ifdepd();
</custom_add_php_command>
- <custom_php_resync_command>
+ <custom_php_resync_config_command>
sync_package_ifdepd();
- </custom_php_resync_command>
+ </custom_php_resync_config_command>
</packagegui>
diff --git a/packages/ifstated.xml b/packages/ifstated.xml
index 378ac242..5adcf9c4 100644
--- a/packages/ifstated.xml
+++ b/packages/ifstated.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,7 @@
<name>ifstated</name>
<version>20041117</version>
<title>ifstated: Settings</title>
+ <aftersaveredirect>pkg_edit.php?xml=ifstated.xml&amp;id=0&amp;savemsg=Updated</aftersaveredirect>
<menu>
<name>ifstated</name>
<tooltiptext>Modify ifstated settings.</tooltiptext>
@@ -54,14 +56,13 @@
<configfile>ifstated.xml</configfile>
<url>/pkg_edit.php?xml=ifstated.xml&amp;id=0</url>
</menu>
- <aftersaveredirect>pkg_edit.php?xml=ifstated.xml&amp;id=0&amp;savemsg=Updated</aftersaveredirect>
- <configpath>installedpackages->package->$packagename->configuration->settings</configpath>
<modify_system>
- <item>
+ <modifyitem>
<modifyfilename>/etc/sysctl.conf</modifyfilename>
<textneeded>net.inet.carp.preempt=1</textneeded>
- </item>
+ </modifyitem>
</modify_system>
+ <configpath>installedpackages->package->$packagename->configuration->settings</configpath>
<fields>
<field>
<fielddescr>External Test IP</fielddescr>
@@ -104,15 +105,6 @@
</options>
</field>
</fields>
- <custom_php_install_command>
- global $config;
- $fout = fopen("/usr/local/etc/rc.d/ifstated.sh","w");
- fwrite($fout,"#!/bin/sh\n\n/usr/local/sbin/ifstated\n");
- fwrite($fout, "# PACKAGE: IFStated\n");
- fwrite($fout, "# EXECUTABLE: ifstated\n");
- fclose($fout);
- chmod("/usr/local/etc/rc.d/ifstated.sh", 0755);
- </custom_php_install_command>
<custom_add_php_command>
conf_mount_rw();
config_lock();
@@ -135,5 +127,14 @@
config_unlock();
mwexec("/usr/bin/killall -HUP ifstated");
</custom_add_php_command>
+ <custom_php_install_command>
+ global $config;
+ $fout = fopen("/usr/local/etc/rc.d/ifstated.sh","w");
+ fwrite($fout,"#!/bin/sh\n\n/usr/local/sbin/ifstated\n");
+ fwrite($fout, "# PACKAGE: IFStated\n");
+ fwrite($fout, "# EXECUTABLE: ifstated\n");
+ fclose($fout);
+ chmod("/usr/local/etc/rc.d/ifstated.sh", 0755);
+ </custom_php_install_command>
</packagegui>
diff --git a/packages/iperf.xml b/packages/iperf.xml
index 60c8512d..29469d33 100644
--- a/packages/iperf.xml
+++ b/packages/iperf.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,8 +48,8 @@
<name>iperf</name>
<version>1.7.0</version>
<title>iperf: Client</title>
- <donotsave>true</donotsave>
<preoutput>yes</preoutput>
+ <donotsave>true</donotsave>
<menu>
<name>iperf</name>
<tooltiptext>Run iperf in client or server mode.</tooltiptext>
diff --git a/packages/iperfserver.xml b/packages/iperfserver.xml
index 9bb1062b..40d1964b 100644
--- a/packages/iperfserver.xml
+++ b/packages/iperfserver.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,8 +48,8 @@
<name>iperf</name>
<version>1.7.0</version>
<title>iperf: Server</title>
- <donotsave>true</donotsave>
<preoutput>yes</preoutput>
+ <donotsave>true</donotsave>
<menu>
<name>iperf</name>
<tooltiptext>Run iperf in client or server mode.</tooltiptext>
diff --git a/packages/mtr-nox11.xml b/packages/mtr-nox11.xml
index e26b3b2e..e0125333 100644
--- a/packages/mtr-nox11.xml
+++ b/packages/mtr-nox11.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,9 @@
<name>mtr</name>
<version>0.65_2</version>
<title>Diagnostics: mtr</title>
- <donotsave>true</donotsave>
- <preoutput>yes</preoutput>
<savetext>mtr</savetext>
+ <preoutput>yes</preoutput>
+ <donotsave>true</donotsave>
<!-- Menu is where this packages menu will appear -->
<menu>
<name>mtr</name>
@@ -80,8 +81,6 @@
<type>checkbox</type>
</field>
</fields>
- <custom_php_deinstall_command>
- </custom_php_deinstall_command>
<custom_add_php_command>
$mtr_options = " -r";
if($_POST['count']) $mtr_options .= " -c " . $_POST['count'];
@@ -89,4 +88,6 @@
$mtr_options .= " " . $_POST['hostname'];
system("/usr/local/sbin/mtr" . $mtr_options);
</custom_add_php_command>
+ <custom_php_deinstall_command>
+ </custom_php_deinstall_command>
</packagegui>
diff --git a/packages/netio.xml b/packages/netio.xml
index 3b2bc21b..bce2e077 100644
--- a/packages/netio.xml
+++ b/packages/netio.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,8 +48,8 @@
<name>netio</name>
<version>1.14</version>
<title>netio: Client</title>
- <donotsave>true</donotsave>
<preoutput>yes</preoutput>
+ <donotsave>true</donotsave>
<menu>
<name>netio</name>
<tooltiptext>Run netio in client or server mode.</tooltiptext>
diff --git a/packages/netioserver.xml b/packages/netioserver.xml
index 199d60fd..4c32ee19 100644
--- a/packages/netioserver.xml
+++ b/packages/netioserver.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,8 +48,8 @@
<name>netioserver</name>
<version>1.14</version>
<title>netio: Server</title>
- <donotsave>true</donotsave>
<preoutput>yes</preoutput>
+ <donotsave>true</donotsave>
<menu>
<name>netio</name>
<tooltiptext>Run netio in client or server mode.</tooltiptext>
diff --git a/packages/ntop/ntop.xml b/packages/ntop/ntop.xml
index a6d27d10..c522803c 100644
--- a/packages/ntop/ntop.xml
+++ b/packages/ntop/ntop.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,9 @@
<description>Describe your package here</description>
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
- <title>Diagnostics: ntop Settings</title>
<name>ntop</name>
<version>3.0</version>
+ <title>Diagnostics: ntop Settings</title>
<savetext>Change</savetext>
<aftersaveredirect>pkg_edit.php?xml=ntop.xml&amp;id=0</aftersaveredirect>
<!-- Menu is where this packages menu will appear -->
@@ -59,8 +60,8 @@
<menu>
<name>ntop</name>
<tooltiptext>Access ntop</tooltiptext>
- <url>http://$myurl:3000</url>
<section>Diagnostics</section>
+ <url>http://$myurl:3000</url>
<depends_on_service>ntop</depends_on_service>
</menu>
<service>
@@ -96,10 +97,10 @@
<field>
<fielddescr>Interface</fielddescr>
<fieldname>interface_array</fieldname>
+ <type>interfaces_selection</type>
+ <size>3</size>
<value>lan</value>
<multiple>true</multiple>
- <size>3</size>
- <type>interfaces_selection</type>
</field>
</fields>
<custom_php_global_functions>
@@ -150,9 +151,9 @@
<custom_add_php_command>
sync_package_ntop();
</custom_add_php_command>
- <custom_php_resync_command>
+ <custom_php_resync_config_command>
sync_package_ntop();
- </custom_php_resync_command>
+ </custom_php_resync_config_command>
<custom_php_install_command>
</custom_php_install_command>
<custom_php_deinstall_command>
diff --git a/packages/p3scan.xml b/packages/p3scan.xml
index 9fe0786f..9bc438ff 100644
--- a/packages/p3scan.xml
+++ b/packages/p3scan.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,26 +45,29 @@
<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>
<include_file>p3scan.inc</include_file>
+ <service>
+ <name>p3scan</name>
+ <rcfile>p3scan.sh</rcfile>
+ <executable>p3scan</executable>
+ <description>POP3 virus/spam scanner.</description>
+ </service>
<additional_files_needed>
<item>http://www.pfsense.org/packages/config/p3scan.inc</item>
</additional_files_needed>
<additional_files_needed>
- <item>http://www.pfsense.org/packages/All/p3scan</item>
<prefix>/usr/local/bin/</prefix>
<chmod>0755</chmod>
+ <item>http://www.pfsense.org/packages/All/p3scan</item>
</additional_files_needed>
<additional_files_needed>
- <item>http://www.pfsense.org/packages/config/p3scan.mail</item>
<prefix>/usr/local/etc/</prefix>
+ <item>http://www.pfsense.org/packages/config/p3scan.mail</item>
</additional_files_needed>
<custom_php_install_command>
p3scan_install_command();
</custom_php_install_command>
- <service>
- <name>p3scan</name>
- <description>POP3 virus/spam scanner.</description>
- <rcfile>p3scan.sh</rcfile>
- <executable>p3scan</executable>
- </service>
</packagegui>
diff --git a/packages/per-user-bandwidth-distribution.xml b/packages/per-user-bandwidth-distribution.xml
index a0d963c8..08728380 100644
--- a/packages/per-user-bandwidth-distribution.xml
+++ b/packages/per-user-bandwidth-distribution.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>
@@ -71,16 +72,16 @@
<type>select</type>
<options>
<option>
- <value>Kbit/s</value>
<name>Kbit/s</name>
+ <value>Kbit/s</value>
</option>
<option>
- <value>Kbyte/s</value>
<name>Kbyte/s</name>
+ <value>Kbyte/s</value>
</option>
<option>
- <value>Mbit/s</value>
<name>Mbit/s</name>
+ <value>Mbit/s</value>
</option>
</options>
</field>
@@ -96,16 +97,16 @@
<type>select</type>
<options>
<option>
- <value>Kbit/s</value>
<name>Kbit/s</name>
+ <value>Kbit/s</value>
</option>
<option>
- <value>Kbyte/s</value>
<name>Kbyte/s</name>
+ <value>Kbyte/s</value>
</option>
<option>
- <value>Mbit/s</value>
<name>Mbit/s</name>
+ <value>Mbit/s</value>
</option>
</options>
</field>
diff --git a/packages/pfstat.xml b/packages/pfstat.xml
index c390790e..29d52bc2 100644
--- a/packages/pfstat.xml
+++ b/packages/pfstat.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>
@@ -57,42 +58,32 @@
<menu>
<name>PFStat Graphs</name>
<tooltiptext>pfstat is a small utility that collects packet filter statistics and produces graphs.</tooltiptext>
- <url>/pfstat.php</url>
<section>Status</section>
+ <url>/pfstat.php</url>
</menu>
- <additional_files_needed>
- <prefix>/usr/local/www/</prefix>
- <chmod>0755</chmod>
- <item>http://www.pfsense.com/packages/config/pfstat.php</item>
- </additional_files_needed>
- <!-- configpath gets expanded out automatically and config items will be
- stored in that location -->
- <configpath>['installedpackages']['pfstat']['config']</configpath>
- <!-- modify system will modify a file and make sure the text needed to run the
- package is in place. The following example edits /etc/crontab and adds the
- code necessart to invoke the pfstat command every 5 minutes. -->
<modify_system>
- <item>
+ <modifyitem>
<modifyfilename>/etc/crontab</modifyfilename>
<textneeded>
*/5 * * * * root nice -n 20 /usr/local/bin/pfstat -q >> /var/log/pfstat
</textneeded>
- </item>
- <item>
+ </modifyitem>
+ <modifyitem>
<modifyfilename>/etc/crontab</modifyfilename>
<textneeded>
*/10 * * * * root nice -n 20 /usr/local/bin/pfstat -c /usr/local/etc/pfstat.conf -d /var/log/pfstat
</textneeded>
- </item>
- <item>
+ </modifyitem>
+ <modifyitem>
<modifyfilename>/etc/crontab</modifyfilename>
<textneeded>
1 1 * * 1 root nice -n 20 tail -n 50000 /var/log/pfstat >/tmp/pfstat &amp;&amp; mv /tmp/pfstat /var/log/pfstat
</textneeded>
- </item>
+ </modifyitem>
</modify_system>
- <!-- adddeleteeditpagefields items will appear on the first page where you can add / delete or edit
- items. An example of this would be the nat page where you add new nat redirects -->
+ <!-- configpath gets expanded out automatically and config items will be
+ stored in that location -->
+ <configpath>['installedpackages']['pfstat']['config']</configpath>
<adddeleteeditpagefields>
<columnitem>
<fielddescr>Graph Name</fielddescr>
@@ -102,7 +93,18 @@
<fielddescr>Description</fielddescr>
<fieldname>description</fieldname>
</columnitem>
- </adddeleteeditpagefields>
+ </adddeleteeditpagefields>
+
+ <additional_files_needed>
+ <prefix>/usr/local/www/</prefix>
+ <chmod>0755</chmod>
+ <item>http://www.pfsense.com/packages/config/pfstat.php</item>
+ </additional_files_needed>
+ <!-- modify system will modify a file and make sure the text needed to run the
+ package is in place. The following example edits /etc/crontab and adds the
+ code necessart to invoke the pfstat command every 5 minutes. -->
+ <!-- adddeleteeditpagefields items will appear on the first page where you can add / delete or edit
+ items. An example of this would be the nat page where you add new nat redirects -->
<!-- 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>
@@ -146,9 +148,6 @@
<combinefieldsbegin>true</combinefieldsbegin>
</field>
<field>
- <combinefieldsend>true</combinefieldsend>
- <dontdisplayname>true</dontdisplayname>
- <dontcombinecells>true</dontcombinecells>
<fielddescr>Update interval duration</fielddescr>
<fieldname>fromclassification</fieldname>
<description></description>
@@ -160,8 +159,13 @@
<option><name>Weeks</name><value>weeks</value></option>
<option><name>Months</name><value>months</value></option>
</options>
+ <combinefieldsend>true</combinefieldsend>
+ <dontdisplayname>true</dontdisplayname>
+ <dontcombinecells>true</dontcombinecells>
</field>
<field>
+ <fielddescr>none</fielddescr>
+ <fieldname>none</fieldname>
<type>rowhelper</type>
<rowhelper>
<rowhelperfield>
@@ -180,28 +184,28 @@
<description></description>
<type>select</type>
<options>
- <option><value>bytes_v4_in</value><name>Bytes in (IPv4)</name></option>
- <option><value>bytes_v4_out</value><name>Bytes out (IPv4)</name></option>
- <option><value>bytes_v6_in</value><name>Bytes in (IPv6)</name></option>
- <option><value>bytes_v6_out</value><name>Bytes out (IPv6)</name></option>
- <option><value>packets_v4_in_pass</value><name>Packets in passed (IPv4)</name></option>
- <option><value>packets_v4_in_drop</value><name>Packets in dropped (IPv4)</name></option>
- <option><value>packets_v4_out_pass</value><name>Packets out passed (IPv4)</name></option>
- <option><value>packets_v4_out_drop</value><name>Packets out dropped (IPv4)</name></option>
- <option><value>packets_v6_in_pass</value><name>Packets in passed (IPv6)</name></option>
- <option><value>packets_v6_in_drop</value><name>Packets in dropped (IPv6)</name></option>
- <option><value>packets_v6_out_pass</value><name>Packets out passed (IPv6)</name></option>
- <option><value>packets_v6_out_drop</value><name>Packets out dropped (IPv6)</name></option>
- <option><value>states_entries</value><name>State table entries</name></option>
- <option><value>states_searches</value><name>State searches</name></option>
- <option><value>states_inserts</value><name>State Table Insertions</name></option>
- <option><value>states_removals</value><name>State Table Removals</name></option>
- <option><value>counters_match</value><name>Match Counter</name></option>
- <option><value>counters_badoffset</value><name>Bad Offset Counter</name></option>
- <option><value>counters_fragment</value><name>Fragment Counter</name></option>
- <option><value>counters_short</value><name>Short Counter</name></option>
- <option><value>counters_normalize</value><name>Normalize Counter</name></option>
- <option><value>counters_memory</value><name>Memory Counter</name></option>
+ <option><name>Bytes in (IPv4)</name><value>bytes_v4_in</value></option>
+ <option><name>Bytes out (IPv4)</name><value>bytes_v4_out</value></option>
+ <option><name>Bytes in (IPv6)</name><value>bytes_v6_in</value></option>
+ <option><name>Bytes out (IPv6)</name><value>bytes_v6_out</value></option>
+ <option><name>Packets in passed (IPv4)</name><value>packets_v4_in_pass</value></option>
+ <option><name>Packets in dropped (IPv4)</name><value>packets_v4_in_drop</value></option>
+ <option><name>Packets out passed (IPv4)</name><value>packets_v4_out_pass</value></option>
+ <option><name>Packets out dropped (IPv4)</name><value>packets_v4_out_drop</value></option>
+ <option><name>Packets in passed (IPv6)</name><value>packets_v6_in_pass</value></option>
+ <option><name>Packets in dropped (IPv6)</name><value>packets_v6_in_drop</value></option>
+ <option><name>Packets out passed (IPv6)</name><value>packets_v6_out_pass</value></option>
+ <option><name>Packets out dropped (IPv6)</name><value>packets_v6_out_drop</value></option>
+ <option><name>State table entries</name><value>states_entries</value></option>
+ <option><name>State searches</name><value>states_searches</value></option>
+ <option><name>State Table Insertions</name><value>states_inserts</value></option>
+ <option><name>State Table Removals</name><value>states_removals</value></option>
+ <option><name>Match Counter</name><value>counters_match</value></option>
+ <option><name>Bad Offset Counter</name><value>counters_badoffset</value></option>
+ <option><name>Fragment Counter</name><value>counters_fragment</value></option>
+ <option><name>Short Counter</name><value>counters_short</value></option>
+ <option><name>Normalize Counter</name><value>counters_normalize</value></option>
+ <option><name>Memory Counter</name><value>counters_memory</value></option>
</options>
</rowhelperfield>
<rowhelperfield>
diff --git a/packages/phpmrss.xml b/packages/phpmrss.xml
index 5fae0c8f..3d144642 100644
--- a/packages/phpmrss.xml
+++ b/packages/phpmrss.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/postfix.xml b/packages/postfix.xml
index 0beb5fee..65b4d11f 100644
--- a/packages/postfix.xml
+++ b/packages/postfix.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,8 +48,8 @@
<name>postfix</name>
<version>1.1.12_1</version>
<title>Services: Postfix Forwarder</title>
- <preoutput>yes</preoutput>
<savetext>Change</savetext>
+ <preoutput>yes</preoutput>
<aftersaveredirect>pkg_edit.php?xml=postfix.xml&amp;id=1</aftersaveredirect>
<menu>
<name>Postfix Forwarder</name>
@@ -70,31 +71,35 @@
<type>input</type>
</field>
<field>
+ <fielddescr>none</fielddescr>
+ <fieldname>none</fieldname>
<type>rowhelper</type>
<rowhelper>
<rowhelperfield>
- <type>input</type>
- <size>20</size>
- <fieldname>domain</fieldname>
<fielddescr>Domain</fielddescr>
+ <fieldname>domain</fieldname>
<description>Enter the domain here (ex: example.com)</description>
- </rowhelperfield>
- <rowhelperfield>
<type>input</type>
<size>20</size>
- <fieldname>mailserverip</fieldname>
+ </rowhelperfield>
+ <rowhelperfield>
<fielddescr>Mail Server IP</fielddescr>
+ <fieldname>mailserverip</fieldname>
<description>Enter the mail server IP to forward to here.</description>
+ <type>input</type>
+ <size>20</size>
</rowhelperfield>
</rowhelper>
</field>
</fields>
<custom_add_php_command>
</custom_add_php_command>
- <custom_php_deinstall_command>
- </custom_php_deinstall_command>
+ <start_command>/usr/local/sbin/postfix start</start_command>
+ <restart_command>/usr/local/sbin/postmap /usr/local/etc/postfix/transport ; /usr/local/sbin/postfix reload</restart_command>
<custom_php_install_command>
</custom_php_install_command>
+ <custom_php_deinstall_command>
+ </custom_php_deinstall_command>
<templates>
<template>
<filename>/usr/local/etc/postfix/main.cf</filename>
@@ -109,6 +114,4 @@ relay_domains = domain_fieldvalue[ ] \n
<templatecontents>domain_fieldvalue smtp:[mailserverip_fieldvalue]\n</templatecontents>
</template>
</templates>
- <start_command>/usr/local/sbin/postfix start</start_command>
- <restart_command>/usr/local/sbin/postmap /usr/local/etc/postfix/transport ; /usr/local/sbin/postfix reload</restart_command>
</packagegui>
diff --git a/packages/powerdns.xml b/packages/powerdns.xml
index 6cd8734b..214da5f4 100644
--- a/packages/powerdns.xml
+++ b/packages/powerdns.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,8 +48,8 @@
<name>powerdns</name>
<version>2.9.16_4</version>
<title>Services: PowerDNS</title>
- <donotsave>true</donotsave>
<preoutput>yes</preoutput>
+ <donotsave>true</donotsave>
<!-- Menu is where this packages menu will appear -->
<menu>
<name>PowerDNS</name>
@@ -73,16 +74,16 @@
<field>
<fielddescr>IP Address</fielddescr>
<fieldname>ipaddress</fieldname>
+ <description>(0.0.0.0 to bind to all)</description>
<type>input</type>
<value>0.0.0.0</value>
- <description>(0.0.0.0 to bind to all)</description>
</field>
<field>
<fielddescr>Cache Time to Live</fielddescr>
<fieldname>cachettl</fieldname>
+ <description>Recommended value: 20</description>
<type>input</type>
<value>20</value>
- <description>Recommended value: 20</description>
</field>
<field>
<fielddescr>Master</fielddescr>
@@ -103,65 +104,6 @@
</options>
</field>
</fields>
- <custom_php_deinstall_command>
- system("/usr/local/bin/pg_ctl -m immediate");
- rmdir_recursive("/usr/local/pgsql");
- system("/usr/sbin/pw userdel pgsql");
- system("/usr/bin/killall -9 postgres");
- echo "&lt;p&gt;";
- echo "Reboot required... One moment...";
- echo "&lt;p&gt;";
- /* system("/sbin/shutdown -r now"); */
- </custom_php_deinstall_command>
- <custom_php_install_command>
- echo "&lt;pre&gt;";
- echo "Creating DB...";
- system("/usr/bin/su -l pgsql -c initdb");
- system("/usr/local/etc/rc.d/010.pgsql.sh start");
- system("/usr/bin/su -l pgsql -c \"dropdb powerdns\" ");
- system("/usr/bin/su -l pgsql -c \"createdb powerdns\" ");
- $fout = fopen("/usr/local/pkg/powerdns.schema","w");
- /* DATABASE SCHEMA */
- fwrite($fout, "create table domains (\n");
- fwrite($fout, "id SERIAL PRIMARY KEY,\n");
- fwrite($fout, "name VARCHAR(255) NOT NULL,\n");
- fwrite($fout, "master VARCHAR(20) DEFAULT NULL,\n");
- fwrite($fout, "last_check INT DEFAULT NULL,\n");
- fwrite($fout, "type VARCHAR(6) NOT NULL,\n");
- fwrite($fout, "notified_serial INT DEFAULT NULL,\n");
- fwrite($fout, "account VARCHAR(40) DEFAULT NULL\n");
- fwrite($fout, ");\n");
- fwrite($fout, "CREATE UNIQUE INDEX name_index ON domains(name);\n");
- fwrite($fout, "CREATE TABLE records (\n");
- fwrite($fout, " id SERIAL PRIMARY KEY,\n");
- fwrite($fout, " domain_id INT DEFAULT NULL,\n");
- fwrite($fout, " name VARCHAR(255) DEFAULT NULL,\n");
- fwrite($fout, " type VARCHAR(6) DEFAULT NULL,\n");
- fwrite($fout, " content VARCHAR(255) DEFAULT NULL,\n");
- fwrite($fout, " ttl INT DEFAULT NULL,\n");
- fwrite($fout, " prio INT DEFAULT NULL,\n");
- fwrite($fout, " change_date INT DEFAULT NULL,\n");
- fwrite($fout, " CONSTRAINT domain_exists\n");
- fwrite($fout, " FOREIGN KEY(domain_id) REFERENCES domains(id)\n");
- fwrite($fout, " ON DELETE CASCADE\n");
- fwrite($fout, ");\n");
- fwrite($fout, "CREATE INDEX rec_name_index ON records(name);\n");
- fwrite($fout, "CREATE INDEX nametype_index ON records(name,type);\n");
- fwrite($fout, "CREATE INDEX domain_id ON records(domain_id);\n");
- fwrite($fout, "create table supermasters (\n");
- fwrite($fout, " ip VARCHAR(25) NOT NULL,\n");
- fwrite($fout, " nameserver VARCHAR(255) NOT NULL,\n");
- fwrite($fout, " account VARCHAR(40) DEFAULT NULL\n");
- fwrite($fout, ");\n");
- fwrite($fout, "GRANT SELECT ON supermasters TO pgsql;\n");
- fwrite($fout, "GRANT ALL ON domains TO pgsql;\n");
- fwrite($fout, "GRANT ALL ON domains_id_seq TO pgsql;\n");
- fwrite($fout, "GRANT ALL ON records TO pgsql;\n");
- fwrite($fout, "GRANT ALL ON records_id_seq TO pgsql;\n");
- fclose($fout);
- system("cat /usr/local/pkg/powerdns.schema | /usr/bin/su -l pgsql -c \"psql powerdns\" ");
- echo "Installation completed!";
- </custom_php_install_command>
<custom_add_php_command>
if($password == $passwordagain) {
conf_mount_rw();
@@ -244,4 +186,63 @@
exit;
}
</custom_add_php_command>
+ <custom_php_install_command>
+ echo "&lt;pre&gt;";
+ echo "Creating DB...";
+ system("/usr/bin/su -l pgsql -c initdb");
+ system("/usr/local/etc/rc.d/010.pgsql.sh start");
+ system("/usr/bin/su -l pgsql -c \"dropdb powerdns\" ");
+ system("/usr/bin/su -l pgsql -c \"createdb powerdns\" ");
+ $fout = fopen("/usr/local/pkg/powerdns.schema","w");
+ /* DATABASE SCHEMA */
+ fwrite($fout, "create table domains (\n");
+ fwrite($fout, "id SERIAL PRIMARY KEY,\n");
+ fwrite($fout, "name VARCHAR(255) NOT NULL,\n");
+ fwrite($fout, "master VARCHAR(20) DEFAULT NULL,\n");
+ fwrite($fout, "last_check INT DEFAULT NULL,\n");
+ fwrite($fout, "type VARCHAR(6) NOT NULL,\n");
+ fwrite($fout, "notified_serial INT DEFAULT NULL,\n");
+ fwrite($fout, "account VARCHAR(40) DEFAULT NULL\n");
+ fwrite($fout, ");\n");
+ fwrite($fout, "CREATE UNIQUE INDEX name_index ON domains(name);\n");
+ fwrite($fout, "CREATE TABLE records (\n");
+ fwrite($fout, " id SERIAL PRIMARY KEY,\n");
+ fwrite($fout, " domain_id INT DEFAULT NULL,\n");
+ fwrite($fout, " name VARCHAR(255) DEFAULT NULL,\n");
+ fwrite($fout, " type VARCHAR(6) DEFAULT NULL,\n");
+ fwrite($fout, " content VARCHAR(255) DEFAULT NULL,\n");
+ fwrite($fout, " ttl INT DEFAULT NULL,\n");
+ fwrite($fout, " prio INT DEFAULT NULL,\n");
+ fwrite($fout, " change_date INT DEFAULT NULL,\n");
+ fwrite($fout, " CONSTRAINT domain_exists\n");
+ fwrite($fout, " FOREIGN KEY(domain_id) REFERENCES domains(id)\n");
+ fwrite($fout, " ON DELETE CASCADE\n");
+ fwrite($fout, ");\n");
+ fwrite($fout, "CREATE INDEX rec_name_index ON records(name);\n");
+ fwrite($fout, "CREATE INDEX nametype_index ON records(name,type);\n");
+ fwrite($fout, "CREATE INDEX domain_id ON records(domain_id);\n");
+ fwrite($fout, "create table supermasters (\n");
+ fwrite($fout, " ip VARCHAR(25) NOT NULL,\n");
+ fwrite($fout, " nameserver VARCHAR(255) NOT NULL,\n");
+ fwrite($fout, " account VARCHAR(40) DEFAULT NULL\n");
+ fwrite($fout, ");\n");
+ fwrite($fout, "GRANT SELECT ON supermasters TO pgsql;\n");
+ fwrite($fout, "GRANT ALL ON domains TO pgsql;\n");
+ fwrite($fout, "GRANT ALL ON domains_id_seq TO pgsql;\n");
+ fwrite($fout, "GRANT ALL ON records TO pgsql;\n");
+ fwrite($fout, "GRANT ALL ON records_id_seq TO pgsql;\n");
+ fclose($fout);
+ system("cat /usr/local/pkg/powerdns.schema | /usr/bin/su -l pgsql -c \"psql powerdns\" ");
+ echo "Installation completed!";
+ </custom_php_install_command>
+ <custom_php_deinstall_command>
+ system("/usr/local/bin/pg_ctl -m immediate");
+ rmdir_recursive("/usr/local/pgsql");
+ system("/usr/sbin/pw userdel pgsql");
+ system("/usr/bin/killall -9 postgres");
+ echo "&lt;p&gt;";
+ echo "Reboot required... One moment...";
+ echo "&lt;p&gt;";
+ /* system("/sbin/shutdown -r now"); */
+ </custom_php_deinstall_command>
</packagegui>
diff --git a/packages/pure-ftpd.xml b/packages/pure-ftpd.xml
index 663079bf..7d9a70d6 100644
--- a/packages/pure-ftpd.xml
+++ b/packages/pure-ftpd.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>
@@ -60,9 +61,6 @@
<section>Services</section>
<url>pkg_edit.php?xml=pure-ftpdsettings.xml&amp;id=0</url>
</menu>
- <additional_files_needed>
- <item>http://www.pfsense.com/packages/config/pure-ftpdsettings.xml</item>
- </additional_files_needed>
<!-- configpath gets expanded out automatically and config items will be
stored in that location seperated with -> -->
<configpath>installedpackages->package->$packagename->configuration</configpath>
@@ -78,6 +76,11 @@
<fieldname>description</fieldname>
</columnitem>
</adddeleteeditpagefields>
+
+ <additional_files_needed>
+ <item>http://www.pfsense.com/packages/config/pure-ftpdsettings.xml</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>
@@ -106,21 +109,10 @@
<type>input</type>
</field>
</fields>
- <custom_php_install_command>
- $fout = fopen("/usr/local/etc/rc.d/pure-ftpd.sh","w");
- fwrite($fout, "#!/bin/sh\n\n");
- fwrite($fout, "# PACKAGE: Pure-FTPD\n");
- fwrite($fout, "# EXECUTABLE: pure-ftpd\n");
- fwrite($fout, "/usr/local/sbin/pure-ftpd -A -B /usr/local/etc/pure-ftpd.conf\n");
- fclose($fout);
- chmod("/usr/local/etc/rc.d/pure-ftpd.sh", 0755);
- mwexec("/usr/local/etc/rc.d/pure-ftpd.sh");
- </custom_php_install_command>
- <custom_php_deinstall_command>
- mwexec("/usr/bin/killall pure-ftpd");
- rmdir_recursive("/usr/local/etc/pure*");
- rmdir_recursive("/usr/local/etc/rc.d/pure*");
- </custom_php_deinstall_command>
+ <custom_delete_php_command>
+ rmdir_recursive("/home/" . $username);
+ system("/usr/sbin/pw userdel " . $username);
+ </custom_delete_php_command>
<custom_add_php_command>
conf_mount_rw();
config_lock();
@@ -139,8 +131,19 @@
config_unlock();
$savemsg = "User has been added.";
</custom_add_php_command>
- <custom_delete_php_command>
- rmdir_recursive("/home/" . $username);
- system("/usr/sbin/pw userdel " . $username);
- </custom_delete_php_command>
+ <custom_php_install_command>
+ $fout = fopen("/usr/local/etc/rc.d/pure-ftpd.sh","w");
+ fwrite($fout, "#!/bin/sh\n\n");
+ fwrite($fout, "# PACKAGE: Pure-FTPD\n");
+ fwrite($fout, "# EXECUTABLE: pure-ftpd\n");
+ fwrite($fout, "/usr/local/sbin/pure-ftpd -A -B /usr/local/etc/pure-ftpd.conf\n");
+ fclose($fout);
+ chmod("/usr/local/etc/rc.d/pure-ftpd.sh", 0755);
+ mwexec("/usr/local/etc/rc.d/pure-ftpd.sh");
+ </custom_php_install_command>
+ <custom_php_deinstall_command>
+ mwexec("/usr/bin/killall pure-ftpd");
+ rmdir_recursive("/usr/local/etc/pure*");
+ rmdir_recursive("/usr/local/etc/rc.d/pure*");
+ </custom_php_deinstall_command>
</packagegui>
diff --git a/packages/pure-ftpdsettings.xml b/packages/pure-ftpdsettings.xml
index b29c5953..f904545c 100644
--- a/packages/pure-ftpdsettings.xml
+++ b/packages/pure-ftpdsettings.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,6 +46,7 @@
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>pure-ftpdsettings</name>
+ <version>none</version>
<title>Services: PureFTPD Settings</title>
<aftersaveredirect>pkg_edit.php?xml=pure-ftpdsettings.xml&amp;id=0</aftersaveredirect>
<!-- Menu is where this packages menu will appear -->
@@ -126,10 +128,8 @@
<type>checkbox</type>
</field>
</fields>
- <custom_php_install_command>
- </custom_php_install_command>
- <custom_php_deinstall_command>
- </custom_php_deinstall_command>
+ <custom_delete_php_command>
+ </custom_delete_php_command>
<custom_add_php_command>
conf_mount_rw();
config_lock();
@@ -154,7 +154,9 @@
mwexec("killall pure-ftpd");
mwexec("/usr/local/etc/rc.d/pure-ftpd.sh");
</custom_add_php_command>
- <custom_delete_php_command>
- </custom_delete_php_command>
+ <custom_php_install_command>
+ </custom_php_install_command>
+ <custom_php_deinstall_command>
+ </custom_php_deinstall_command>
</packagegui>
diff --git a/packages/sassassin.xml b/packages/sassassin.xml
index f1f3fed2..eb82fd55 100644
--- a/packages/sassassin.xml
+++ b/packages/sassassin.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,21 +45,10 @@
<description>Describe your package here</description>
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
+ <name>spamassassin</name>
+ <version>none</version>
+ <title>Antispam: Configuration</title>
<include_file>sassassin.inc</include_file>
-
- <!-- Installation -->
- <additional_files_needed>
- <item>http://www.pfsense.org/packages/config/sassassin_wl.xml</item>
- </additional_files_needed>
- <additional_files_needed>
- <item>http://www.pfsense.org/packages/config/sassassin_bl.xml</item>
- </additional_files_needed>
- <additional_files_needed>
- <item>http://www.pfsense.org/packages/config/sassassin.inc</item>
- </additional_files_needed>
- <custom_php_install_command>
- sassassin_install_command();
- </custom_php_install_command>
<menu>
<name>Antispam</name>
<tooltiptext>Configure the Antispam service.</tooltiptext>
@@ -67,14 +57,10 @@
</menu>
<service>
<name>SpamAssassin</name>
- <description>The SpamAssassin spam detection software.</description>
<rcfile>spamd.sh</rcfile>
<executable>spamd</executable>
+ <description>The SpamAssassin spam detection software.</description>
</service>
-
- <!-- Interface -->
- <name>spamassassin</name>
- <title>Antispam: Configuration</title>
<tabs>
<tab>
<text>Configuration</text>
@@ -90,66 +76,75 @@
<url>/pkg.php?xml=sassassin_bl.xml</url>
</tab>
</tabs>
+ <additional_files_needed>
+ <item>http://www.pfsense.org/packages/config/sassassin_wl.xml</item>
+ </additional_files_needed>
+ <additional_files_needed>
+ <item>http://www.pfsense.org/packages/config/sassassin_bl.xml</item>
+ </additional_files_needed>
+ <additional_files_needed>
+ <item>http://www.pfsense.org/packages/config/sassassin.inc</item>
+ </additional_files_needed>
<fields>
<field>
- <fieldname>enable</fieldname>
<fielddescr>Enable antispam</fielddescr>
+ <fieldname>enable</fieldname>
<description>Check to enable the antispam protection.</description>
- <required/>
<type>checkbox</type>
<enablefields>bayes,bayes_learn,threshold,subject,send_spam</enablefields>
+ <required/>
</field>
<field>
- <fieldname>bayes</fieldname>
<fielddescr>Bayesian classifier</fielddescr>
+ <fieldname>bayes</fieldname>
<description>Check this to enable the Bayesian classifier.</description>
- <default_value>on</default_value>
- <required/>
<type>checkbox</type>
+ <required/>
+ <default_value>on</default_value>
</field>
<field>
- <fieldname>bayes_learn</fieldname>
<fielddescr>Bayesian auto-learning</fielddescr>
+ <fieldname>bayes_learn</fieldname>
<description>Check this to enable the Bayesian auto-learning system.</description>
- <default_value>on</default_value>
- <required/>
<type>checkbox</type>
+ <required/>
+ <default_value>on</default_value>
</field>
<field>
- <fieldname>threshold</fieldname>
<fielddescr>Spam threshold</fielddescr>
+ <fieldname>threshold</fieldname>
<description>Set the threshold at which a message is considered spam.</description>
- <default_value>5.0</default_value>
- <required/>
<type>input</type>
+ <required/>
+ <default_value>5.0</default_value>
</field>
<field>
- <fieldname>subject</fieldname>
<fielddescr>Rewrite subject</fielddescr>
+ <fieldname>subject</fieldname>
<description>This is the string that will be added to the subject of spam emails.</description>
- <default_value>*** SPAM ***</default_value>
<type>input</type>
+ <default_value>*** SPAM ***</default_value>
</field>
<field>
- <fieldname>send_spam</fieldname>
<fielddescr>How to send spam messages</fielddescr>
+ <fieldname>send_spam</fieldname>
<description>Choose between not sending spam messages, sending them as an RFC-822 MIME attachment (recommended) or as plain text.</description>
<type>select</type>
+ <default_value>attachment</default_value>
<options>
<option>
- <value>donotsave</value>
<name>Do not send</name>
+ <value>donotsave</value>
</option>
<option>
- <value>attachment</value>
<name>Send as an attachment (recommended)</name>
+ <value>attachment</value>
</option>
<option>
- <value>plaintext</value>
<name>Send as plain text</name>
+ <value>plaintext</value>
</option>
</options>
- <default_value>attachment</default_value>
</field>
</fields>
<custom_php_validation_command>
@@ -158,4 +153,7 @@
<custom_php_resync_config_command>
sassassin_resync();
</custom_php_resync_config_command>
+ <custom_php_install_command>
+ sassassin_install_command();
+ </custom_php_install_command>
</packagegui>
diff --git a/packages/sassassin_bl.xml b/packages/sassassin_bl.xml
index 235813c0..850d971c 100644
--- a/packages/sassassin_bl.xml
+++ b/packages/sassassin_bl.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,6 +46,7 @@
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>sassassinbl</name>
+ <version>none</version>
<title>AntiSPAM: Blacklist</title>
<include_file>sassassin.inc</include_file>
<tabs>
@@ -64,25 +66,25 @@
</tabs>
<adddeleteeditpagefields>
<columnitem>
- <fieldname>address</fieldname>
<fielddescr>Address</fielddescr>
+ <fieldname>address</fieldname>
</columnitem>
<columnitem>
- <fieldname>description</fieldname>
<fielddescr>Description</fielddescr>
+ <fieldname>description</fieldname>
</columnitem>
</adddeleteeditpagefields>
<fields>
<field>
- <fieldname>address</fieldname>
<fielddescr>Address</fielddescr>
+ <fieldname>address</fieldname>
<description>This is the email address that will be added to the blacklist (valid wildcards: *, ?).</description>
- <required/>
<type>input</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/sassassin_wl.xml b/packages/sassassin_wl.xml
index c5e1f88f..132f3e16 100644
--- a/packages/sassassin_wl.xml
+++ b/packages/sassassin_wl.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,6 +46,7 @@
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>sassassinwl</name>
+ <version>none</version>
<title>AntiSPAM: Whitelist</title>
<include_file>sassassin.inc</include_file>
<tabs>
@@ -64,25 +66,25 @@
</tabs>
<adddeleteeditpagefields>
<columnitem>
- <fieldname>address</fieldname>
<fielddescr>Address</fielddescr>
+ <fieldname>address</fieldname>
</columnitem>
<columnitem>
- <fieldname>description</fieldname>
<fielddescr>Description</fielddescr>
+ <fieldname>description</fieldname>
</columnitem>
</adddeleteeditpagefields>
<fields>
<field>
- <fieldname>address</fieldname>
<fielddescr>Address</fielddescr>
+ <fieldname>address</fieldname>
<description>This is the email address that will be added to the whitelist (valid wildcards: *, ?).</description>
- <required/>
<type>input</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/schema/packages.dtd b/packages/schema/packages.dtd
index 3f42b948..abb4cd6a 100644
--- a/packages/schema/packages.dtd
+++ b/packages/schema/packages.dtd
@@ -51,9 +51,13 @@
<!-- Indicates where to get more informations about this package -->
<!ELEMENT url (#PCDATA)>
<!-- needs to be documented -->
+<!ELEMENT depends_on_service (#PCDATA)>
+<!-- needs to be documented -->
<!ELEMENT tooltiptext (#PCDATA)>
<!-- The title of a particular package -->
<!ELEMENT title (#PCDATA)>
+<!-- needs to be documented -->
+<!ELEMENT textneeded (#PCDATA)>
<!-- Categroy of a particular package (e.g. System) -->
<!ELEMENT category (#PCDATA)>
<!-- needs to be documented -->
@@ -83,16 +87,20 @@
<!-- needs to be documented -->
<!ELEMENT prefix (#PCDATA)>
<!-- 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?))>
+<!ELEMENT packagegui ((copyright, description, requirements, faq, name, version, title, category?, note?, savetext?, preoutput?, donotsave?, aftersaveredirect?, include_file?, backup_file?, delete_string?, addedit_string?, menu*, service*, modify_system?, 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?, process_kill_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?, templates?))>
<!-- A particular name -->
<!ELEMENT name (#PCDATA)>
<!-- Menu item. Container element -->
-<!ELEMENT menu ((name, tooltiptext?, section?, configfile?, url?))>
+<!ELEMENT menu ((name, tooltiptext?, section?, configfile?, url?, depends_on_service?))>
+<!-- needs to be documented -->
+<!ELEMENT modifyitem ((modifyfilename?, textneeded?))>
<!-- 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 backup_file (#PCDATA)>
+<!-- needs to be documented -->
<!ELEMENT delete_string (#PCDATA)>
<!-- needs to be documented -->
<!ELEMENT addedit_string (#PCDATA)>
@@ -101,7 +109,11 @@
<!-- 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?))>
+<!ELEMENT modifyfilename (#PCDATA)>
+<!-- needs to be documented -->
+<!ELEMENT modify_system ((modifyitem+))>
+<!-- needs to be documented -->
+<!ELEMENT rowhelperfield ((fielddescr, fieldname, description, type, size?, options?))>
<!-- needs to be documented -->
<!ELEMENT rowhelper ((rowhelperfield+))>
<!-- needs to be documented -->
@@ -125,8 +137,14 @@
<!-- needs to be documented -->
<!ELEMENT rows (#PCDATA)>
<!-- needs to be documented -->
+<!ELEMENT combinefieldsbegin (#PCDATA)>
+<!-- needs to be documented -->
<!ELEMENT combinefieldsend (#PCDATA)>
<!-- needs to be documented -->
+<!ELEMENT dontdisplayname (#PCDATA)>
+<!-- needs to be documented -->
+<!ELEMENT dontcombinecells (#PCDATA)>
+<!-- needs to be documented -->
<!ELEMENT onchange (#PCDATA)>
<!-- needs to be documented -->
<!ELEMENT encoding (#PCDATA)>
@@ -139,11 +157,15 @@
<!-- needs to be documented -->
<!ELEMENT fields ((field*))>
<!-- needs to be documented -->
+<!ELEMENT filename (#PCDATA)>
+<!-- needs to be documented -->
<!ELEMENT fieldname (#PCDATA)>
<!-- needs to be documented -->
<!ELEMENT fielddescr (#PCDATA)>
<!-- 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?))>
+<!ELEMENT validationtype (#PCDATA)>
+<!-- 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?, combinefieldsbegin?, rowhelper?, dontdisplayname?, dontcombinecells?, validationtype?))>
<!-- needs to be documented -->
<!ELEMENT description (#PCDATA)>
<!-- needs to be documented -->
@@ -161,6 +183,8 @@
<!-- needs to be documented -->
<!ELEMENT custom_add_php_command_late (#PCDATA)>
<!-- needs to be documented -->
+<!ELEMENT process_kill_command (#PCDATA)>
+<!-- needs to be documented -->
<!ELEMENT start_command (#PCDATA)>
<!-- needs to be documented -->
<!ELEMENT restart_command (#PCDATA)>
@@ -190,5 +214,11 @@
<!ELEMENT additional_files_needed ((prefix?, chmod?, item))>
<!-- needs to be documented -->
<!ELEMENT active EMPTY>
+<!-- needs to be documented -->
+<!ELEMENT templates ((template+))>
+<!-- needs to be documented -->
+<!ELEMENT templatecontents (#PCDATA)>
+<!-- needs to be documented -->
+<!ELEMENT template ((filename, templatecontents))>
<!-- End of pfSense package DTD V1.0 ...................................... -->
<!-- ...................................................................... -->
diff --git a/packages/siproxd.xml b/packages/siproxd.xml
index ca819a5c..9fed0025 100644
--- a/packages/siproxd.xml
+++ b/packages/siproxd.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,8 +46,9 @@
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>siproxd</name>
- <title>siproxd: Settings</title>
<version>0.5.13_pfs1</version>
+ <title>siproxd: Settings</title>
+ <aftersaveredirect>pkg_edit.php?xml=siproxd.xml&amp;id=0</aftersaveredirect>
<menu>
<name>siproxd</name>
<tooltiptext>Modify siproxd users and settings.</tooltiptext>
@@ -54,7 +56,11 @@
<configfile>siproxd.xml</configfile>
<url>/pkg_edit.php?xml=siproxd.xml&amp;id=0</url>
</menu>
- <aftersaveredirect>pkg_edit.php?xml=siproxd.xml&amp;id=0</aftersaveredirect>
+ <service>
+ <name>siproxd</name>
+ <rcfile>siproxd.sh</rcfile>
+ <executable>siproxd</executable>
+ </service>
<tabs>
<tab>
<text>Settings</text>
@@ -66,15 +72,10 @@
<url>/pkg.php?xml=siproxdusers.xml</url>
</tab>
</tabs>
- <service>
- <name>siproxd</name>
- <rcfile>siproxd.sh</rcfile>
- <executable>siproxd</executable>
- </service>
+ <configpath>installedpackages->package->$packagename->configuration->settings</configpath>
<additional_files_needed>
<item>http://www.pfsense.com/packages/config/siproxdusers.xml</item>
</additional_files_needed>
- <configpath>installedpackages->package->$packagename->configuration->settings</configpath>
<fields>
<field>
<fielddescr>Inbound interface</fielddescr>
@@ -143,14 +144,14 @@
<field>
<fielddescr>Outbound proxy hostname</fielddescr>
<fieldname>outboundproxyhost</fieldname>
- <type>input</type>
<description>Enter the hostname of an outbound proxy to send all traffic to. This is only useful if you have multiple masquerading firewalls to cross.</description>
+ <type>input</type>
</field>
<field>
<fielddescr>Outbound proxy port</fielddescr>
<fieldname>outboundproxyport</fieldname>
- <type>input</type>
<description>Enter the port of the outbound proxy to send all traffic to. This is only useful if you have multiple masquerading firewalls to cross.</description>
+ <type>input</type>
</field>
</fields>
<custom_php_global_functions>
@@ -220,11 +221,11 @@
config_unlock();
}
</custom_php_global_functions>
- <custom_php_resync_config_command>
- sync_package_siproxd();
- </custom_php_resync_config_command>
<custom_add_php_command>
sync_package_siproxd();
</custom_add_php_command>
+ <custom_php_resync_config_command>
+ sync_package_siproxd();
+ </custom_php_resync_config_command>
</packagegui>
diff --git a/packages/siproxdusers.xml b/packages/siproxdusers.xml
index 039f726a..a25418f9 100644
--- a/packages/siproxdusers.xml
+++ b/packages/siproxdusers.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>
@@ -89,9 +90,6 @@
<type>input</type>
</field>
</fields>
- <custom_php_resync_config_command>
- sync_package_sipproxd_users();
- </custom_php_resync_config_command>
<custom_add_php_command>
function sync_package_sipproxd_users()
{
@@ -112,5 +110,8 @@
}
sync_package_sipproxd_users();
</custom_add_php_command>
+ <custom_php_resync_config_command>
+ sync_package_sipproxd_users();
+ </custom_php_resync_config_command>
</packagegui>
diff --git a/packages/spamd.xml b/packages/spamd.xml
index 840a721f..765ae263 100644
--- a/packages/spamd.xml
+++ b/packages/spamd.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,8 @@
<faq>Currently there are no FAQ items provided.</faq>
<name>spamdsources</name>
<version>4.2</version>
- <include_file>/usr/local/pkg/spamd.inc</include_file>
<title>SpamD: External Sources</title>
+ <include_file>/usr/local/pkg/spamd.inc</include_file>
<backup_file>/var/db/spamd</backup_file>
<!-- Menu is where this packages menu will appear -->
<menu>
@@ -82,6 +83,23 @@
<url>/pkg_edit.php?xml=spamd_outlook.xml&amp;id=0</url>
</tab>
</tabs>
+ <!-- configpath gets expanded out automatically and config items will be
+ stored in that location -->
+ <configpath>['installedpackages']['spamd']['config']</configpath>
+ <adddeleteeditpagefields>
+ <columnitem>
+ <fielddescr>Provider Name</fielddescr>
+ <fieldname>providername</fieldname>
+ </columnitem>
+ <columnitem>
+ <fielddescr>Provider Type</fielddescr>
+ <fieldname>providertype</fieldname>
+ </columnitem>
+ <columnitem>
+ <fielddescr>Description</fielddescr>
+ <fieldname>providerdescription</fieldname>
+ </columnitem>
+ </adddeleteeditpagefields>
<additional_files_needed>
<prefix>/usr/local/www/</prefix>
<chmod>0755</chmod>
@@ -122,23 +140,7 @@
<chmod>0755</chmod>
<item>http://www.pfsense.com/packages/config/spamd_gather_stats.php</item>
</additional_files_needed>
- <!-- configpath gets expanded out automatically and config items will be
- stored in that location -->
- <configpath>['installedpackages']['spamd']['config']</configpath>
- <adddeleteeditpagefields>
- <columnitem>
- <fielddescr>Provider Name</fielddescr>
- <fieldname>providername</fieldname>
- </columnitem>
- <columnitem>
- <fielddescr>Provider Type</fielddescr>
- <fieldname>providertype</fieldname>
- </columnitem>
- <columnitem>
- <fielddescr>Description</fielddescr>
- <fieldname>providerdescription</fieldname>
- </columnitem>
- </adddeleteeditpagefields>
+
<!-- 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>
@@ -146,19 +148,19 @@
<fielddescr>Provider Name</fielddescr>
<fieldname>providername</fieldname>
<description>Enter the name of the source</description>
- <size>30</size>
<type>input</type>
+ <size>30</size>
</field>
<field>
<fielddescr>Provider Type</fielddescr>
<fieldname>providertype</fieldname>
<description>Select the Provider Type</description>
<type>select</type>
- <value>black</value>
<size>1</size>
+ <value>black</value>
<options>
- <option><value>black</value><name>Black List</name></option>
- <option><value>white</value><name>White List</name></option>
+ <option><name>Black List</name><value>black</value></option>
+ <option><name>White List</name><value>white</value></option>
</options>
</field>
<field>
@@ -167,8 +169,8 @@
<description>Enter the description for this item</description>
<type>textarea</type>
<size>30</size>
- <rows>4</rows>
<cols>40</cols>
+ <rows>4</rows>
</field>
<field>
<fielddescr>Reject message</fielddescr>
@@ -176,29 +178,29 @@
<description>Enter the message to display to emailing parties that are on this providers list</description>
<type>textarea</type>
<size>30</size>
- <rows>2</rows>
<cols>40</cols>
+ <rows>2</rows>
</field>
<field>
<fielddescr>Provider Method</fielddescr>
<fieldname>providermethod</fieldname>
<description>Select the Provider Method</description>
<type>select</type>
- <value>http</value>
<size>1</size>
+ <value>http</value>
<options>
- <option><value>file</value><name>File</name></option>
- <option><value>http</value><name>URL</name></option>
- <option><value>exec</value><name>Execute command</name></option>
+ <option><name>File</name><value>file</value></option>
+ <option><name>URL</name><value>http</value></option>
+ <option><name>Execute command</name><value>exec</value></option>
</options>
</field>
<field>
<fielddescr>Provider URL or Filename</fielddescr>
<fieldname>providerurl</fieldname>
<description>Enter the URL to the provider.</description>
- <rows>4</rows>
- <cols>40</cols>
<type>textarea</type>
+ <cols>40</cols>
+ <rows>4</rows>
</field>
</fields>
<custom_delete_php_command>
diff --git a/packages/spamd_outlook.xml b/packages/spamd_outlook.xml
index cdb43c36..894044ed 100644
--- a/packages/spamd_outlook.xml
+++ b/packages/spamd_outlook.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/spamd_settings.xml b/packages/spamd_settings.xml
index 18d31170..87096423 100644
--- a/packages/spamd_settings.xml
+++ b/packages/spamd_settings.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,9 +47,9 @@
<faq>Currently there are no FAQ items provided.</faq>
<name>spamdsettings</name>
<version>0.1.0</version>
- <include_file>/usr/local/pkg/spamd.inc</include_file>
<title>SpamD Settings</title>
<aftersaveredirect>pkg_edit.php?xml=spamd_settings.xml&amp;id=0</aftersaveredirect>
+ <include_file>/usr/local/pkg/spamd.inc</include_file>
<!-- Menu is where this packages menu will appear -->
<menu>
<name>SpamD</name>
@@ -164,13 +165,13 @@
<fieldname>replysmtperror</fieldname>
<description>The SMTP error to return to the spammer, i.e. 450, 451, 550. This defaults to 450.</description>
<type>select</type>
- <value>450</value>
<size>1</size>
+ <value>450</value>
<options>
- <option><value></value><name></name></option>
- <option><value>450</value><name>450</name></option>
- <option><value>451</value><name>451</name></option>
- <option><value>550</value><name>550</name></option>
+ <option><name></name><value></value></option>
+ <option><name>450</name><value>450</value></option>
+ <option><name>451</name><value>451</value></option>
+ <option><name>550</name><value>550</value></option>
</options>
</field>
<field>
diff --git a/packages/spamd_whitelist.xml b/packages/spamd_whitelist.xml
index ec0b8186..f55a48aa 100644
--- a/packages/spamd_whitelist.xml
+++ b/packages/spamd_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/squidGuard.xml b/packages/squidGuard.xml
index ded957d0..dd837e50 100644
--- a/packages/squidGuard.xml
+++ b/packages/squidGuard.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,6 +46,9 @@
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>squidGuard</name>
+ <version>none</version>
+ <title>none</title>
+ <process_kill_command>squid</process_kill_command>
<custom_php_install_command>
$fout = fopen("/usr/local/etc/squid/squidGuard.conf","w");
fwrite($fout, "# This configuration was generated by the pfSense package manager.\n");
@@ -118,5 +122,4 @@
remove_text_from_file("/usr/local/etc/squid/squid.conf", "redirect_program /usr/local/bin/squidGuard -c /usr/local/etc/squid/squidGuard.conf");
mwexec("/usr/local/sbin/squid -k reconfigure");
</custom_php_deinstall_command>
- <process_kill_command>squid</process_kill_command>
</packagegui>
diff --git a/packages/stunnel.xml b/packages/stunnel.xml
index f23d50cd..f30ff732 100644
--- a/packages/stunnel.xml
+++ b/packages/stunnel.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>
@@ -115,6 +116,26 @@
<type>input</type>
</field>
</fields>
+ <custom_add_php_command_late>
+ conf_mount_rw();
+ config_lock();
+ $fout = fopen("/usr/local/etc/stunnel/stunnel.conf","w");
+ fwrite($fout, "cert = /usr/local/etc/stunnel/stunnel.pem \n");
+ fwrite($fout, "chroot = /var/tmp/stunnel \n");
+ fwrite($fout, "setuid = stunnel \n");
+ fwrite($fout, "setgid = stunnel \n");
+ foreach($config['installedpackages']['stunnel']['config'] as $pkgconfig) {
+ fwrite($fout, "\n[" . $pkgconfig['description'] . "]\n");
+ fwrite($fout, "accept = " . $pkgconfig['localip'] . ":" . $pkgconfig['localport'] . "\n");
+ fwrite($fout, "connect = " . $pkgconfig['redirectip'] . ":" . $pkgconfig['redirectport'] . "\n");
+ fwrite($fout, "TIMEOUTclose = 0\n\n");
+ }
+ fclose($fout);
+ conf_mount_ro();
+ config_unlock();
+ system("/usr/bin/killall stunnel 2>/dev/null");
+ system("/usr/local/etc/rc.d/stunnel.sh start 2>/dev/null");
+ </custom_add_php_command_late>
<custom_php_install_command>
safe_mkdir("/usr/local/etc/stunnel");
system("/usr/bin/openssl req -new -x509 -days 365 -nodes -out /usr/local/etc/stunnel/stunnel.pem -keyout /usr/local/etc/stunnel/stunnel.pem 2>/dev/null");
@@ -137,24 +158,4 @@
rmdir_recursive("/var/tmp/stunnel");
rmdir_recursive("/usr/local/etc/stunnel*");
</custom_php_deinstall_command>
- <custom_add_php_command_late>
- conf_mount_rw();
- config_lock();
- $fout = fopen("/usr/local/etc/stunnel/stunnel.conf","w");
- fwrite($fout, "cert = /usr/local/etc/stunnel/stunnel.pem \n");
- fwrite($fout, "chroot = /var/tmp/stunnel \n");
- fwrite($fout, "setuid = stunnel \n");
- fwrite($fout, "setgid = stunnel \n");
- foreach($config['installedpackages']['stunnel']['config'] as $pkgconfig) {
- fwrite($fout, "\n[" . $pkgconfig['description'] . "]\n");
- fwrite($fout, "accept = " . $pkgconfig['localip'] . ":" . $pkgconfig['localport'] . "\n");
- fwrite($fout, "connect = " . $pkgconfig['redirectip'] . ":" . $pkgconfig['redirectport'] . "\n");
- fwrite($fout, "TIMEOUTclose = 0\n\n");
- }
- fclose($fout);
- conf_mount_ro();
- config_unlock();
- system("/usr/bin/killall stunnel 2>/dev/null");
- system("/usr/local/etc/rc.d/stunnel.sh start 2>/dev/null");
- </custom_add_php_command_late>
</packagegui>
diff --git a/packages/upclient.xml b/packages/upclient.xml
index ba603ad2..42f71a25 100644
--- a/packages/upclient.xml
+++ b/packages/upclient.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,8 @@
<requirements>Describe your package requirements here</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>upclient</name>
- <title>upclient: Settings</title>
<version>5.0.b8_2</version>
- <configpath>installedpackages->package->$packagename->configuration->settings</configpath>
+ <title>upclient: Settings</title>
<aftersaveredirect>pkg_edit.php?xml=upclient.xml&amp;id=0</aftersaveredirect>
<menu>
<name>upclient</name>
@@ -61,6 +61,7 @@
<rcfile>upclient.sh</rcfile>
<executable>upclient</executable>
</service>
+ <configpath>installedpackages->package->$packagename->configuration->settings</configpath>
<fields>
<field>
<fielddescr>Authorization Key</fielddescr>
diff --git a/packages/viralator.xml b/packages/viralator.xml
index fa1cb353..7573af94 100644
--- a/packages/viralator.xml
+++ b/packages/viralator.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,6 +45,9 @@
<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>
<include_file>viralator.inc</include_file>
<additional_files_needed>
<item>http://www.pfsense.org/packages/config/viralator.inc</item>
diff --git a/packages/widentd.xml b/packages/widentd.xml
index 768d7ec7..ca73d436 100644
--- a/packages/widentd.xml
+++ b/packages/widentd.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,6 @@
<faq>Currently there are no FAQ items provided.</faq>
<name>widentd</name>
<version>1.03_1</version>
- <configpath>installedpackages->package->$packagename->configuration->settings</configpath>
<title>Services: widentd</title>
<menu>
<name>widentd</name>
@@ -59,6 +59,7 @@
<rcfile>widentd.sh</rcfile>
<executable>widentd</executable>
</service>
+ <configpath>installedpackages->package->$packagename->configuration->settings</configpath>
<fields>
<field>
<fielddescr>Listening interface</fielddescr>
@@ -76,13 +77,10 @@
<fielddescr>System name</fielddescr>
<fieldname>sysname</fieldname>
<description>Enter the system name you'd like displayed via widentd</description>
- <value>pfSense</value>
<type>input</type>
+ <value>pfSense</value>
</field>
</fields>
- <custom_php_install_command>
- unlink_if_exists("/usr/local/etc/rc.d/widentd.sh");
- </custom_php_install_command>
<custom_php_global_functions>
function sync_package_widentd() {
conf_mount_rw();
@@ -117,5 +115,8 @@
<custom_add_php_command>
sync_package_widentd();
</custom_add_php_command>
+ <custom_php_install_command>
+ unlink_if_exists("/usr/local/etc/rc.d/widentd.sh");
+ </custom_php_install_command>
</packagegui>