From 04d90095755a6f0c5d33769f6cc8607f791e2cd0 Mon Sep 17 00:00:00 2001
From: Monocots <gitmaster@rhizomatica.org>
Date: Tue, 2 Mar 2021 06:14:51 +0000
Subject: [PATCH] Remove ns1 version of sgsn config

---
 modules/rhizo_base/manifests/openbsc.pp       |  8 +---
 .../templates/make_sgsn_acl_config.erb        |  5 ++-
 .../templates/osmo-sgsn-ns1.cfg.erb           | 39 -------------------
 3 files changed, 4 insertions(+), 48 deletions(-)
 delete mode 100644 modules/rhizo_base/templates/osmo-sgsn-ns1.cfg.erb

diff --git a/modules/rhizo_base/manifests/openbsc.pp b/modules/rhizo_base/manifests/openbsc.pp
index d6f5734..64957cd 100644
--- a/modules/rhizo_base/manifests/openbsc.pp
+++ b/modules/rhizo_base/manifests/openbsc.pp
@@ -150,14 +150,8 @@ class rhizo_base::openbsc {
       default     => 'installed',
      }
 
-    $sgsn_cfg_file = $repo ? {
-      'latest'    => '-ns1',
-      'nightly'   => '',
-      default     => '',
-     }
-
     file { '/etc/osmocom/osmo-sgsn.cfg':
-         content => template("rhizo_base/osmo-sgsn$sgsn_cfg_file.cfg.erb"),
+         content => template("rhizo_base/osmo-sgsn.cfg.erb"),
          mode => "0750",
          notify  => Service['osmo-sgsn'],
       }
diff --git a/modules/rhizo_base/templates/make_sgsn_acl_config.erb b/modules/rhizo_base/templates/make_sgsn_acl_config.erb
index d320b3d..4042e9a 100644
--- a/modules/rhizo_base/templates/make_sgsn_acl_config.erb
+++ b/modules/rhizo_base/templates/make_sgsn_acl_config.erb
@@ -36,8 +36,9 @@ ns
  timer tns-test 30
  timer tns-alive 3
  timer tns-alive-retries 10
- encapsulation udp local-port 23000
- encapsulation framerelay-gre enabled 0
+ bind udp local
+  listen 172.16.0.1 23000
+  accept-ipaccess
 !
 bssgp
 !
diff --git a/modules/rhizo_base/templates/osmo-sgsn-ns1.cfg.erb b/modules/rhizo_base/templates/osmo-sgsn-ns1.cfg.erb
deleted file mode 100644
index d2a5c9e..0000000
--- a/modules/rhizo_base/templates/osmo-sgsn-ns1.cfg.erb
+++ /dev/null
@@ -1,39 +0,0 @@
-!
-! Osmocom SGSN configuration
-!
-!
-log stderr
- logging level set-all fatal
- logging print category 1
- logging print file basename last
- logging print level 1
- logging print extended-timestamp 1
- logging level gprs error
- logging level mm error
- logging level llc error
-line vty
- no login
-!
-sgsn
- gtp local-ip <%= @vpn_ip_address %>
- ggsn 0 remote-ip <%= @ggsn_ip_address %>
- ggsn 0 gtp-version 1
- ggsn 0 echo-interval 60
- auth-policy accept-all
- gsup remote-ip <%= @vpn_ip_address %>
- gsup remote-port 4222
- authentication optional
-!
-ns
- timer tns-block 3
- timer tns-block-retries 3
- timer tns-reset 3
- timer tns-reset-retries 3
- timer tns-test 30
- timer tns-alive 3
- timer tns-alive-retries 10
- encapsulation udp local-port 23000
- encapsulation framerelay-gre enabled 0
-!
-bssgp
-!