diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2014-12-30 11:36:01 -0200 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2014-12-30 11:36:01 -0200 |
| commit | 4b6c1012da36dd079a219056f812970b29a36fb7 (patch) | |
| tree | 66aa0ec29885f8e1e8b052d761962ce6d91360ad /config | |
| parent | ecdec6fac1f5fb34b458ab02ae3804f831840041 (diff) | |
| parent | c1af350bd7f71c6f7fc791d075b8155d78472a6c (diff) | |
| download | pfsense-packages-4b6c1012da36dd079a219056f812970b29a36fb7.tar.gz pfsense-packages-4b6c1012da36dd079a219056f812970b29a36fb7.tar.bz2 pfsense-packages-4b6c1012da36dd079a219056f812970b29a36fb7.zip | |
Merge pull request #749 from dbaio/apcupsd_01
Diffstat (limited to 'config')
| -rw-r--r-- | config/apcupsd/apcupsd.inc | 4 | ||||
| -rw-r--r-- | config/apcupsd/apcupsd.xml | 13 |
2 files changed, 13 insertions, 4 deletions
diff --git a/config/apcupsd/apcupsd.inc b/config/apcupsd/apcupsd.inc index 3340738a..c123861c 100644 --- a/config/apcupsd/apcupsd.inc +++ b/config/apcupsd/apcupsd.inc @@ -167,9 +167,7 @@ function sync_package_apcupsd(){ $apcupsd_start .= " if [ ! -d {$lockfile} ]; then \n"; $apcupsd_start .= " /bin/mkdir -p {$lockfile} \n"; $apcupsd_start .= " fi \n"; - $apcupsd_start .= " if [ -f {$lockfile}/LCK.. ]; then \n"; - $apcupsd_start .= " /bin/rm -f {$lockfile}/LCK.. \n"; - $apcupsd_start .= " fi \n"; + $apcupsd_start .= " /bin/rm -f {$lockfile}/*LCK* 2>/dev/null \n"; if ($apcupsd_config['killonpowerfail']=="on"){ $apcupsd_start .= " " . APCUPSD_BASE . "/sbin/apcupsd --kill-on-powerfail"; }else{ diff --git a/config/apcupsd/apcupsd.xml b/config/apcupsd/apcupsd.xml index 5ef2b946..8a42f352 100644 --- a/config/apcupsd/apcupsd.xml +++ b/config/apcupsd/apcupsd.xml @@ -40,7 +40,7 @@ <name>Apcupsd</name> <title>Services: Apcupsd (General)</title> <category>Monitoring</category> - <version>0.3.1</version> + <version>0.3.2</version> <include_file>/usr/local/pkg/apcupsd.inc</include_file> <addedit_string>Apcupsd has been created/modified.</addedit_string> <delete_string>Apcupsd has been deleted.</delete_string> @@ -334,6 +334,17 @@ UPSTYPE DEVICE Description <br> <option><name>Share</name><value>share</value></option> </options> </field> + <field> + <name>Notifications</name> + <type>listtopic</type> + </field> + <field> + <fieldname>notification_info</fieldname> + <type>info</type> + <description>In order to receive e-mail notifications, you need to configure + SMTP Email Notifications on Advanced/Notifications section, and also, + install mailreport package.</description> + </field> </fields> <custom_php_install_command>php_install_apcupsd();</custom_php_install_command> <custom_php_command_before_form></custom_php_command_before_form> |