diff options
| author | Kristian Lyngstol <kly@kly.no> | 2016-06-28 16:22:21 +0200 |
|---|---|---|
| committer | Kristian Lyngstol <kly@kly.no> | 2016-06-28 16:22:21 +0200 |
| commit | 6f2295c7784492d9347930f49f97a97d3e7b6841 (patch) | |
| tree | c89e4c469ced302cfeb15df1d0e06a277bcd502a | |
| parent | 009105ffa53e2e8f81b94f8ff2063635b4958fbc (diff) | |
Adjust for dx prod
| -rw-r--r-- | extras/misc/apache2.conf | 4 | ||||
| -rwxr-xr-x | extras/tools/add_switches.txt.pl | 2 | ||||
| -rw-r--r-- | include/nms/util.pm | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/extras/misc/apache2.conf b/extras/misc/apache2.conf index 10817cf..017eb7c 100644 --- a/extras/misc/apache2.conf +++ b/extras/misc/apache2.conf @@ -11,7 +11,7 @@ AllowOverride None Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch <RequireAny> - AuthUserFile /htpasswd-write + AuthUserFile /opt/gondul/passwords/htpasswd-write AuthName "Demo/test of nms" AuthType Basic Require valid-user @@ -21,7 +21,7 @@ AllowOverride None Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch <RequireAny> - AuthUserFile /htpasswd-read + AuthUserFile /opt/gondul/passwords/htpasswd-read AuthName "Demo/test of nms" AuthType Basic Require valid-user diff --git a/extras/tools/add_switches.txt.pl b/extras/tools/add_switches.txt.pl index 635e356..b4f4ef2 100755 --- a/extras/tools/add_switches.txt.pl +++ b/extras/tools/add_switches.txt.pl @@ -8,7 +8,7 @@ use strict; use warnings; use Data::Dumper; -use lib '../include'; +use lib '/opt/gondul/include'; use JSON; use nms::util; diff --git a/include/nms/util.pm b/include/nms/util.pm index 33c8735..b6ebbe6 100644 --- a/include/nms/util.pm +++ b/include/nms/util.pm @@ -62,8 +62,8 @@ sub guess_placement_dx { my $name = $_[0]; my $src = "unknown"; - if ($name =~ /^row\d+-\d+$/) { - $name =~ /row(\d+)-(\d+)/; + if ($name =~ /^e\d+-\d+$/) { + $name =~ /e(\d+)-(\d+)/; my ($e, $s) = ($1, $2); $src = "main"; |