diff options
| author | jim-p <jimp@pfsense.org> | 2015-12-17 08:09:56 -0500 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2015-12-17 08:09:56 -0500 |
| commit | 2cbebcfe988509eed9382228335ceb07c4e1ce37 (patch) | |
| tree | 99f3a9a41c66ff54e1deda768b53f05f1aeb6e84 | |
| parent | 5ae60e62d4f4249e39f0f78a31f094043fbe118a (diff) | |
| parent | 391b0167a2fd2a89ef7c1985ff677f87e1391f61 (diff) | |
| download | pfsense-packages-2cbebcfe988509eed9382228335ceb07c4e1ce37.tar.gz pfsense-packages-2cbebcfe988509eed9382228335ceb07c4e1ce37.tar.bz2 pfsense-packages-2cbebcfe988509eed9382228335ceb07c4e1ce37.zip | |
Merge pull request #1213 from doktornotor/patch-1
| -rw-r--r-- | config/sarg/sarg.inc | 4 | ||||
| -rw-r--r-- | pkg_config.10.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml | 2 | ||||
| -rw-r--r-- | pkg_config.8.xml.amd64 | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/config/sarg/sarg.inc b/config/sarg/sarg.inc index 22e70c95..253dab9d 100644 --- a/config/sarg/sarg.inc +++ b/config/sarg/sarg.inc @@ -94,7 +94,9 @@ function sarg_check_dirs() { if (is_dir($pbidir) && !is_link($pbidir)) { rmdir_recursive($pbidir); } - symlink("/usr/local/sarg-reports", "{$pbidir}"); + if (!is_link($pbidir)) { + symlink("/usr/local/sarg-reports", "{$pbidir}"); + } } // images diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 8b37c0dd..bab38184 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -635,7 +635,7 @@ <config_file>https://packages.pfsense.org/packages/config/sarg/sarg.xml</config_file> <pkginfolink>https://forum.pfsense.org/index.php/topic,47765.0.html</pkginfolink> <depends_on_package_pbi>sarg-2.3.9-##ARCH##.pbi</depends_on_package_pbi> - <version>0.6.9</version> + <version>0.6.10</version> <status>RELEASE</status> <required_version>2.2</required_version> <port_category>www</port_category> diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 8e6f22f2..c04ffda7 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -640,7 +640,7 @@ <depends_on_package>sarg-2.3.6_2.tbz</depends_on_package> <depends_on_package>gd-2.0.35_8,1.tbz</depends_on_package> <depends_on_package_pbi>sarg-2.3.6_2-i386.pbi</depends_on_package_pbi> - <version>2.3.6_2 pkg v0.6.9</version> + <version>2.3.6_2 pkg v0.6.10</version> <status>Release</status> <required_version>2.1</required_version> <configurationfile>sarg.xml</configurationfile> diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index a395c133..62923844 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -640,7 +640,7 @@ <depends_on_package>sarg-2.3.6_2.tbz</depends_on_package> <depends_on_package>gd-2.0.35_8,1.tbz</depends_on_package> <depends_on_package_pbi>sarg-2.3.6_2-amd64.pbi</depends_on_package_pbi> - <version>2.3.6_2 pkg v0.6.9</version> + <version>2.3.6_2 pkg v0.6.10</version> <status>Release</status> <required_version>2.1</required_version> <configurationfile>sarg.xml</configurationfile> |