Commit 8d394966 authored by Franco Fichtner's avatar Franco Fichtner

contrib: move private files, part of upcoming contrib code rework

Long story short: we don't want contrib code inside src/opnsense/contrib
so a few things need to be shuffled.  First pass is moving the current
contrib stuff to the same location instead and migrating the non-code
tzdata file.

(cherry picked from commit b1120c8e)
parent 0e6b5a9b
ROOT= /usr/local/share
TREES= openvpn mobile-broadband-provider-info
ROOT= /usr/local/opnsense/contrib
TREES= mobile-broadband-provider-info openvpn tzdata
.include "../Mk/tree.mk"
......@@ -459,7 +459,7 @@ function openvpn_client_export_installer($srvid, $usrid, $crtid, $useaddr, $veri
$client_install_exe = "openvpn-install-{$current_openvpn_version}-I0{$current_openvpn_version_rev}-i686.exe";
}
$ovpndir = "/usr/local/share/openvpn";
$ovpndir = "/usr/local/opnsense/contrib/openvpn";
$workdir = "{$ovpndir}/client-export";
$validconfig = openvpn_client_export_validate_config($srvid, $usrid, $crtid);
......@@ -563,7 +563,7 @@ function viscosity_openvpn_client_config_exporter($srvid, $usrid, $crtid, $usead
global $config, $g;
$uname_p = trim(exec("uname -p"));
$ovpndir = "/usr/local/share/openvpn/";
$ovpndir = "/usr/local/opnsense/contrib/openvpn/";
$uniq = uniqid();
$tempdir = "/tmp/openvpn-export-{$uniq}";
......
......@@ -32,7 +32,7 @@ require_once("services.inc");
require_once("pfsense-utils.inc");
require_once("system.inc");
$serviceproviders_xml = "/usr/local/share/mobile-broadband-provider-info/serviceproviders.xml";
$serviceproviders_xml = "/usr/local/opnsense/contrib/mobile-broadband-provider-info/serviceproviders.xml";
$serviceproviders_contents = file_get_contents($serviceproviders_xml);
$serviceproviders_attr = xml2array($serviceproviders_contents,1,"attr");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment