aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2018-09-12 20:01:21 +0200
committerPau Espin Pedrol <pespin@sysmocom.de>2018-09-13 15:28:25 +0200
commit6a9a88e816421ac3d8facded54fc079c586ced21 (patch)
tree534daa97a7f86be52c5deed5e6c42af0fffcc8ee
parent422492998660ba40d3d7986fd43e1d7aafa3774a (diff)
Install sample cfg file to /etc/osmocom
-rw-r--r--debian/osmo-bsc-mgcp.install1
-rw-r--r--debian/osmocom-bsc-nat.install1
-rw-r--r--debian/osmocom-bsc-sccplite.install1
-rw-r--r--debian/osmocom-nitb.install1
-rw-r--r--openbsc/doc/examples/Makefile.am18
-rw-r--r--openbsc/doc/examples/osmo-bsc_mgcp/osmo-bsc-mgcp.cfg (renamed from openbsc/doc/examples/osmo-bsc_mgcp/mgcp.cfg)0
-rw-r--r--openbsc/doc/examples/osmo-bsc_nat/osmo-bsc-nat.cfg (renamed from openbsc/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg)0
-rw-r--r--openbsc/doc/examples/osmo-nitb/bs11/osmo-nitb.cfg (renamed from openbsc/doc/examples/osmo-nitb/bs11/openbsc.cfg)0
-rw-r--r--openbsc/doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg (renamed from openbsc/doc/examples/osmo-nitb/nanobts/openbsc.cfg)0
-rw-r--r--openbsc/doc/examples/osmo-nitb/rbs2308/osmo-nitb.cfg (renamed from openbsc/doc/examples/osmo-nitb/rbs2308/openbsc.cfg)0
-rw-r--r--openbsc/doc/examples/osmo-nitb/sysmobts/osmo-nitb.cfg (renamed from openbsc/doc/examples/osmo-nitb/sysmobts/openbsc.cfg)0
-rw-r--r--openbsc/osmoappdesc.py12
-rw-r--r--openbsc/tests/ctrl_test_runner.py4
-rw-r--r--openbsc/tests/smpp_test_runner.py2
-rw-r--r--openbsc/tests/vty_test_runner.py6
15 files changed, 34 insertions, 12 deletions
diff --git a/debian/osmo-bsc-mgcp.install b/debian/osmo-bsc-mgcp.install
index 828fb31de..8f9b74f69 100644
--- a/debian/osmo-bsc-mgcp.install
+++ b/debian/osmo-bsc-mgcp.install
@@ -1,2 +1,3 @@
+etc/osmocom/osmo-bsc-mgcp.cfg
lib/systemd/system/osmo-bsc-mgcp.service
usr/bin/osmo-bsc_mgcp
diff --git a/debian/osmocom-bsc-nat.install b/debian/osmocom-bsc-nat.install
index d6cabe23a..ba134d13e 100644
--- a/debian/osmocom-bsc-nat.install
+++ b/debian/osmocom-bsc-nat.install
@@ -1,2 +1,3 @@
+/etc/osmocom/osmo-bsc-nat.cfg
/lib/systemd/system/osmo-bsc-nat.service
/usr/bin/osmo-bsc_nat
diff --git a/debian/osmocom-bsc-sccplite.install b/debian/osmocom-bsc-sccplite.install
index 67c50cbca..872333e5a 100644
--- a/debian/osmocom-bsc-sccplite.install
+++ b/debian/osmocom-bsc-sccplite.install
@@ -1,2 +1,3 @@
+/etc/osmocom/osmo-bsc-sccplite.cfg
/lib/systemd/system/osmo-bsc-sccplite.service
/usr/bin/osmo-bsc-sccplite
diff --git a/debian/osmocom-nitb.install b/debian/osmocom-nitb.install
index 78e8f7712..87ed7e288 100644
--- a/debian/osmocom-nitb.install
+++ b/debian/osmocom-nitb.install
@@ -1,3 +1,4 @@
+/etc/osmocom/osmo-nitb.cfg
/lib/systemd/system/osmo-nitb.service
/usr/bin/osmo-nitb
openbsc/contrib/*.py usr/bin/
diff --git a/openbsc/doc/examples/Makefile.am b/openbsc/doc/examples/Makefile.am
index 530c3fa8f..2b8336f4b 100644
--- a/openbsc/doc/examples/Makefile.am
+++ b/openbsc/doc/examples/Makefile.am
@@ -1,3 +1,21 @@
+
+OSMOCONF_FILES = \
+ osmo-nitb/sysmobts/osmo-nitb.cfg \
+ osmo-bsc_mgcp/osmo-bsc-mgcp.cfg
+
+if BUILD_NAT
+OSMOCONF_FILES += osmo-bsc_nat/osmo-bsc-nat.cfg
+endif
+
+if BUILD_BSC
+OSMOCONF_FILES += osmo-bsc-sccplite/osmo-bsc-sccplite.cfg
+endif
+
+osmoconfdir = $(sysconfdir)/osmocom
+osmoconf_DATA = $(OSMOCONF_FILES)
+
+EXTRA_DIST = $(OSMOCONF_FILES)
+
CFG_FILES = find $(srcdir) -name '*.cfg*' | sed -e 's,^$(srcdir),,'
dist-hook:
diff --git a/openbsc/doc/examples/osmo-bsc_mgcp/mgcp.cfg b/openbsc/doc/examples/osmo-bsc_mgcp/osmo-bsc-mgcp.cfg
index 67f288e3b..67f288e3b 100644
--- a/openbsc/doc/examples/osmo-bsc_mgcp/mgcp.cfg
+++ b/openbsc/doc/examples/osmo-bsc_mgcp/osmo-bsc-mgcp.cfg
diff --git a/openbsc/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg b/openbsc/doc/examples/osmo-bsc_nat/osmo-bsc-nat.cfg
index 6b48e970e..6b48e970e 100644
--- a/openbsc/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg
+++ b/openbsc/doc/examples/osmo-bsc_nat/osmo-bsc-nat.cfg
diff --git a/openbsc/doc/examples/osmo-nitb/bs11/openbsc.cfg b/openbsc/doc/examples/osmo-nitb/bs11/osmo-nitb.cfg
index bcb0b984a..bcb0b984a 100644
--- a/openbsc/doc/examples/osmo-nitb/bs11/openbsc.cfg
+++ b/openbsc/doc/examples/osmo-nitb/bs11/osmo-nitb.cfg
diff --git a/openbsc/doc/examples/osmo-nitb/nanobts/openbsc.cfg b/openbsc/doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg
index c5e7be839..c5e7be839 100644
--- a/openbsc/doc/examples/osmo-nitb/nanobts/openbsc.cfg
+++ b/openbsc/doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg
diff --git a/openbsc/doc/examples/osmo-nitb/rbs2308/openbsc.cfg b/openbsc/doc/examples/osmo-nitb/rbs2308/osmo-nitb.cfg
index d7837964b..d7837964b 100644
--- a/openbsc/doc/examples/osmo-nitb/rbs2308/openbsc.cfg
+++ b/openbsc/doc/examples/osmo-nitb/rbs2308/osmo-nitb.cfg
diff --git a/openbsc/doc/examples/osmo-nitb/sysmobts/openbsc.cfg b/openbsc/doc/examples/osmo-nitb/sysmobts/osmo-nitb.cfg
index 7cd5d1f8f..7cd5d1f8f 100644
--- a/openbsc/doc/examples/osmo-nitb/sysmobts/openbsc.cfg
+++ b/openbsc/doc/examples/osmo-nitb/sysmobts/osmo-nitb.cfg
diff --git a/openbsc/osmoappdesc.py b/openbsc/osmoappdesc.py
index c5b20aca3..5b01e4c57 100644
--- a/openbsc/osmoappdesc.py
+++ b/openbsc/osmoappdesc.py
@@ -20,19 +20,19 @@ nitb_e1_configs = [
"doc/examples/osmo-nitb/bs11/openbsc-2bts-2trx.cfg",
"doc/examples/osmo-nitb/bs11/openbsc-1bts-2trx-hopping.cfg",
"doc/examples/osmo-nitb/bs11/openbsc-1bts-2trx.cfg",
- "doc/examples/osmo-nitb/bs11/openbsc.cfg",
+ "doc/examples/osmo-nitb/bs11/osmo-nitb.cfg",
"doc/examples/osmo-nitb/nokia/openbsc_nokia_3trx.cfg",
"doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg",
- "doc/examples/osmo-nitb/rbs2308/openbsc.cfg"
+ "doc/examples/osmo-nitb/rbs2308/osmo-nitb.cfg"
]
app_configs = {
"osmo-bsc-sccplite": ["doc/examples/osmo-bsc-sccplite/osmo-bsc-sccplite.cfg"],
- "nat": ["doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg"],
- "mgcp": ["doc/examples/osmo-bsc_mgcp/mgcp.cfg"],
+ "nat": ["doc/examples/osmo-bsc_nat/osmo-bsc-nat.cfg"],
+ "mgcp": ["doc/examples/osmo-bsc_mgcp/osmo-bsc-mgcp.cfg"],
"nitb": ["doc/examples/osmo-nitb/nanobts/openbsc-multitrx.cfg",
- "doc/examples/osmo-nitb/nanobts/openbsc.cfg"],
+ "doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg"],
}
@@ -43,6 +43,6 @@ apps = [(4242, "src/osmo-bsc/osmo-bsc-sccplite", "OsmoBSC", "osmo-bsc-sccplite")
]
vty_command = ["./src/osmo-nitb/osmo-nitb", "-c",
- "doc/examples/osmo-nitb/nanobts/openbsc.cfg"]
+ "doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg"]
vty_app = apps[3] # reference apps[] entry for osmo-nitb
diff --git a/openbsc/tests/ctrl_test_runner.py b/openbsc/tests/ctrl_test_runner.py
index cf83fad8d..d76ed659e 100644
--- a/openbsc/tests/ctrl_test_runner.py
+++ b/openbsc/tests/ctrl_test_runner.py
@@ -468,7 +468,7 @@ class TestCtrlNITB(TestCtrlBase):
def ctrl_command(self):
return ["./src/osmo-nitb/osmo-nitb", "-c",
- "doc/examples/osmo-nitb/nanobts/openbsc.cfg", "-l", "test_hlr.sqlite3"]
+ "doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg", "-l", "test_hlr.sqlite3"]
def ctrl_app(self):
return (4249, "./src/osmo-nitb/osmo-nitb", "OsmoBSC", "nitb")
@@ -577,7 +577,7 @@ class TestCtrlNAT(TestCtrlBase):
def ctrl_command(self):
return ["./src/osmo-bsc_nat/osmo-bsc_nat", "-c",
- "doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg"]
+ "doc/examples/osmo-bsc_nat/osmo-bsc-nat.cfg"]
def ctrl_app(self):
return (4250, "./src/osmo-bsc_nat/osmo-bsc_nat", "OsmoNAT", "nat")
diff --git a/openbsc/tests/smpp_test_runner.py b/openbsc/tests/smpp_test_runner.py
index 2fd144b2b..58645aa07 100644
--- a/openbsc/tests/smpp_test_runner.py
+++ b/openbsc/tests/smpp_test_runner.py
@@ -64,7 +64,7 @@ class TestSMPPNITB(TestVTYBase):
def vty_command(self):
return ["./src/osmo-nitb/osmo-nitb", "-c",
- "doc/examples/osmo-nitb/nanobts/openbsc.cfg"]
+ "doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg"]
def vty_app(self):
return (4242, "./src/osmo-nitb/osmo-nitb", "OpenBSC", "nitb")
diff --git a/openbsc/tests/vty_test_runner.py b/openbsc/tests/vty_test_runner.py
index a3161fba1..5afcd2ebd 100644
--- a/openbsc/tests/vty_test_runner.py
+++ b/openbsc/tests/vty_test_runner.py
@@ -66,7 +66,7 @@ class TestVTYBase(unittest.TestCase):
class TestVTYMGCP(TestVTYBase):
def vty_command(self):
return ["./src/osmo-bsc_mgcp/osmo-bsc_mgcp", "-c",
- "doc/examples/osmo-bsc_mgcp/mgcp.cfg"]
+ "doc/examples/osmo-bsc_mgcp/osmo-bsc-mgcp.cfg"]
def vty_app(self):
return (4243, "./src/osmo-bsc_mgcp/osmo-bsc_mgcp", "OpenBSC MGCP", "mgcp")
@@ -170,7 +170,7 @@ class TestVTYNITB(TestVTYGenericBSC):
def vty_command(self):
return ["./src/osmo-nitb/osmo-nitb", "-c",
- "doc/examples/osmo-nitb/nanobts/openbsc.cfg"]
+ "doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg"]
def vty_app(self):
return (4242, "./src/osmo-nitb/osmo-nitb", "OpenBSC", "nitb")
@@ -765,7 +765,7 @@ class TestVTYNAT(TestVTYGenericBSC):
def vty_command(self):
return ["./src/osmo-bsc_nat/osmo-bsc_nat", "-l", "127.0.0.1", "-c",
- "doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg"]
+ "doc/examples/osmo-bsc_nat/osmo-bsc-nat.cfg"]
def vty_app(self):
return (4244, "src/osmo-bsc_nat/osmo-bsc_nat", "OsmoBSCNAT", "nat")