summaryrefslogtreecommitdiffstats
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 13:04:16 +0200
commit6c1fd303eac5399d868897f56579caa4a20e54a7 (patch)
tree783436531792f2456fbf9ef8ab1454c1efb88fb1
parent422492998660ba40d3d7986fd43e1d7aafa3774a (diff)
Install sample cfg file to /etc/osmocompespin/systemd
-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/contrib/systemd/osmo-nitb.service2
-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/osmoappdesc.py4
-rw-r--r--openbsc/tests/ctrl_test_runner.py2
-rw-r--r--openbsc/tests/vty_test_runner.py4
11 files changed, 28 insertions, 6 deletions
diff --git a/debian/osmo-bsc-mgcp.install b/debian/osmo-bsc-mgcp.install
index 828fb31..8f9b74f 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 d6cabe2..ba134d1 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 67c50cb..872333e 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 78e8f77..0cf18ee 100644
--- a/debian/osmocom-nitb.install
+++ b/debian/osmocom-nitb.install
@@ -1,3 +1,4 @@
+/etc/osmocom/openbsc.cfg
/lib/systemd/system/osmo-nitb.service
/usr/bin/osmo-nitb
openbsc/contrib/*.py usr/bin/
diff --git a/openbsc/contrib/systemd/osmo-nitb.service b/openbsc/contrib/systemd/osmo-nitb.service
index 377497e..805623c 100644
--- a/openbsc/contrib/systemd/osmo-nitb.service
+++ b/openbsc/contrib/systemd/osmo-nitb.service
@@ -4,7 +4,7 @@ Description=OpenBSC Network In the Box (NITB)
[Service]
Type=simple
Restart=always
-ExecStart=/usr/bin/osmo-nitb -s -C -c /etc/osmocom/osmo-nitb.cfg -l /var/lib/osmocom/hlr.sqlite3
+ExecStart=/usr/bin/osmo-nitb -s -C -c /etc/osmocom/openbsc.cfg -l /var/lib/osmocom/hlr.sqlite3
RestartSec=2
[Install]
diff --git a/openbsc/doc/examples/Makefile.am b/openbsc/doc/examples/Makefile.am
index 530c3fa..1bdae3b 100644
--- a/openbsc/doc/examples/Makefile.am
+++ b/openbsc/doc/examples/Makefile.am
@@ -1,3 +1,21 @@
+
+OSMOCONF_FILES = \
+ osmo-nitb/sysmobts/openbsc.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 67f288e..67f288e 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 6b48e97..6b48e97 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/osmoappdesc.py b/openbsc/osmoappdesc.py
index c5b20ac..a272b4d 100644
--- a/openbsc/osmoappdesc.py
+++ b/openbsc/osmoappdesc.py
@@ -29,8 +29,8 @@ nitb_e1_configs = [
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"],
}
diff --git a/openbsc/tests/ctrl_test_runner.py b/openbsc/tests/ctrl_test_runner.py
index cf83fad..4182baa 100644
--- a/openbsc/tests/ctrl_test_runner.py
+++ b/openbsc/tests/ctrl_test_runner.py
@@ -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/vty_test_runner.py b/openbsc/tests/vty_test_runner.py
index a3161fb..e3b7411 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")
@@ -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")