diff options
Diffstat (limited to 'packages/freenas/pkg')
| -rw-r--r-- | packages/freenas/pkg/freenas.inc | 5 | ||||
| -rw-r--r-- | packages/freenas/pkg/freenas.xml | 12 | ||||
| -rw-r--r-- | packages/freenas/pkg/freenas_services.inc | 18 |
3 files changed, 18 insertions, 17 deletions
diff --git a/packages/freenas/pkg/freenas.inc b/packages/freenas/pkg/freenas.inc index 4b21879f..1f514853 100644 --- a/packages/freenas/pkg/freenas.inc +++ b/packages/freenas/pkg/freenas.inc @@ -196,7 +196,7 @@ function custom_php_install_command() { if (! file_exists("/usr/local/etc/rc.d")) mwexec("mkdir -p /usr/local/etc/rc.d"); - + rename("/usr/local/pkg/rc.freenas", "/usr/local/etc/rc.d/rc.freenas"); chmod ("/usr/local/etc/rc.d/rc.freenas", 0755); } @@ -204,6 +204,7 @@ function custom_php_install_command() { function custom_php_deinstall_command() { oninstall_copy_kernel_binaries("deinstall"); oninstall_copy_misc_binaries("deinstall"); -} + if (! file_exists("/usr/local/etc/rc.d")) + mwexec("rm -rf /usr/local/etc/rc.d"); } ?> diff --git a/packages/freenas/pkg/freenas.xml b/packages/freenas/pkg/freenas.xml index 5acbbdc7..5c52cb08 100644 --- a/packages/freenas/pkg/freenas.xml +++ b/packages/freenas/pkg/freenas.xml @@ -6,18 +6,17 @@ <include_file>/usr/local/pkg/freenas.inc</include_file> <!-- Menu is where this packages menu will appear --> <menu> - <name>FreeNAS Disks</name> + <name>Disks</name> <section>System</section> - <configfile>freenas.xml</configfile> - <url>/disk_manage.php</url> + <url>/disks_manage.php</url> </menu> <menu> - <name>FreeNAS RAID</name> + <name>RAID</name> <section>System</section> <url>/disks_raid_gmirror.php</url> </menu> <menu> - <name>FreeNAS Mounts</name> + <name>Mounts</name> <section>System</section> <url>/disks_mount.php</url> </menu> @@ -282,7 +281,8 @@ <additional_files_needed> <prefix>/usr/local/pkg/</prefix> <chmod>0755</chmod> - <item>http://www.pfsense.com/packages/config/freenas/pkg/rc.freenas</item> + <item>http://www.pfsense.com/packages/config/freenas/pkg/freenas_system.inc</item> + </additional_files_needed> </additional_files_needed> <!-- kernel binaries --> <additional_files_needed> diff --git a/packages/freenas/pkg/freenas_services.inc b/packages/freenas/pkg/freenas_services.inc index a2d8d531..26455f8f 100644 --- a/packages/freenas/pkg/freenas_services.inc +++ b/packages/freenas/pkg/freenas_services.inc @@ -18,7 +18,7 @@ 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE @@ -488,7 +488,7 @@ pasv_high_range={$freenas_config['ftp']['pasv_max_port']} EOD; } - $ftpconf =. <<<EOD + $ftpconf .= <<<EOD pasv_low_range = 2500 pasv_high_range = 3000 @@ -1228,12 +1228,12 @@ function services_avahi_configure() { EOD; /* kill any running dbus daemon */ - sigkillbypid("{$g['varrun_path']}/dbus/dbus.pid"", "TERM"); + sigkillbypid("{$g['varrun_path']}/dbus/dbus.pid", "TERM"); /* kill any running avahi daemons */ mwexec("/usr/local/sbin/avahi-daemon -k"); - + if (isset($config['system']['zeroconf_disable'])) return 0; @@ -1242,7 +1242,7 @@ EOD; if (isset($config['system']['webgui']['port'])) { $webservice = str_replace("@PORT@", - "{$config['system']['webgui']['port']}", + $config['system']['webgui']['port'], $service_template); $webservice = str_replace("@TYPE@", "_http._tcp", @@ -1272,15 +1272,15 @@ EOD; file_put_contents("/usr/local/etc/avahi/services/http.service", $webservice); } - + if (isset($freenas_config['afp']['enable'])) { /* NOP */ } - + if (isset($freenas_config['rsyncd']['enable'])) { $rsyncservice = str_replace("@PORT@", - "{$config['rsyncd']['port']}", + $config['rsyncd']['port'], $service_template); $rsyncservice = str_replace("@TYPE@", "_rsync._tcp", @@ -1294,7 +1294,7 @@ EOD; file_put_contents("/usr/local/etc/avahi/services/rsync.service", $rsyncservice); } - + if (isset($config['sshd']['enable'])) { $sshservice = str_replace("@PORT@", "22", |