This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Pau Espin Pedrol gerrit-no-reply at lists.osmocom.orgPau Espin Pedrol has submitted this change and it was merged. ( https://gerrit.osmocom.org/10926 ) Change subject: Install sample cfg file to /etc/osmocom ...................................................................... Install sample cfg file to /etc/osmocom Change-Id: I080ae6a4c4f92dd8df055efd25e308f8a3377d34 --- M debian/osmo-bsc-mgcp.install M debian/osmocom-bsc-nat.install M debian/osmocom-bsc-sccplite.install M debian/osmocom-nitb.install M openbsc/doc/examples/Makefile.am R openbsc/doc/examples/osmo-bsc_mgcp/osmo-bsc-mgcp.cfg R openbsc/doc/examples/osmo-bsc_nat/osmo-bsc-nat.cfg R openbsc/doc/examples/osmo-nitb/bs11/osmo-nitb.cfg R openbsc/doc/examples/osmo-nitb/nanobts/osmo-nitb.cfg R openbsc/doc/examples/osmo-nitb/rbs2308/osmo-nitb.cfg R openbsc/doc/examples/osmo-nitb/sysmobts/osmo-nitb.cfg M openbsc/osmoappdesc.py M openbsc/tests/ctrl_test_runner.py M openbsc/tests/smpp_test_runner.py M openbsc/tests/vty_test_runner.py 15 files changed, 34 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified Harald Welte: Looks good to me, approved 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..87ed7e2 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 530c3fa..2b8336f 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 similarity index 100% rename from openbsc/doc/examples/osmo-bsc_mgcp/mgcp.cfg rename to 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 similarity index 100% rename from openbsc/doc/examples/osmo-bsc_nat/osmo-bsc_nat.cfg rename to 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 similarity index 100% rename from openbsc/doc/examples/osmo-nitb/bs11/openbsc.cfg rename to 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 similarity index 100% rename from openbsc/doc/examples/osmo-nitb/nanobts/openbsc.cfg rename to 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 similarity index 100% rename from openbsc/doc/examples/osmo-nitb/rbs2308/openbsc.cfg rename to 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 similarity index 100% rename from openbsc/doc/examples/osmo-nitb/sysmobts/openbsc.cfg rename to openbsc/doc/examples/osmo-nitb/sysmobts/osmo-nitb.cfg diff --git a/openbsc/osmoappdesc.py b/openbsc/osmoappdesc.py index c5b20ac..5b01e4c 100644 --- a/openbsc/osmoappdesc.py +++ b/openbsc/osmoappdesc.py @@ -20,19 +20,19 @@ "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 @@ ] 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 cf83fad..d76ed65 100644 --- a/openbsc/tests/ctrl_test_runner.py +++ b/openbsc/tests/ctrl_test_runner.py @@ -468,7 +468,7 @@ 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 @@ 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 2fd144b..58645aa 100644 --- a/openbsc/tests/smpp_test_runner.py +++ b/openbsc/tests/smpp_test_runner.py @@ -64,7 +64,7 @@ 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 a3161fb..5afcd2e 100644 --- a/openbsc/tests/vty_test_runner.py +++ b/openbsc/tests/vty_test_runner.py @@ -66,7 +66,7 @@ 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 @@ 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 @@ 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") -- To view, visit https://gerrit.osmocom.org/10926 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I080ae6a4c4f92dd8df055efd25e308f8a3377d34 Gerrit-Change-Number: 10926 Gerrit-PatchSet: 6 Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de> Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org> Gerrit-Reviewer: Jenkins Builder (1000002) Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de> -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180913/2c9c5808/attachment.htm>