Merge branch 'pptp-rewrite' of github.com:c-po/vyos-1x into current

* 'pptp-rewrite' of github.com:c-po/vyos-1x:
  accel-ppp: fix wrong reference in verify() on missing attributes
  accel-ppp: T2314: bugfix wrong placement of endif in Jinja2 template
  vpn: pptp: T2351: add support for common radius-additions XML
  vpn: pptp: T2351: migrate to common radius CLI
  vpn: pptp: T2351: migrate to common name-server, wins-server nodes
  accel-ppp: provide common wins-server include definition
  vpn: pptp: T2351: use first IP from client pool as gateway address
  vpn: pptp: T2351: align configuration to other accel implementations
  vpn: pptp: T2351: migrate from SysVinit to systemd
  vyos.util: migrate all cpu_count() occurances to common get_half_cpus()

4 files changed, 29 insertions, 111 deletions

diff --git a/interface-definitions/include/accel-wins-server.xml.i b/interface-definitions/include/accel-wins-server.xml.i
new file mode 100644
index 000000000..461a65ddf
--- /dev/null
+++ b/interface-definitions/include/accel-wins-server.xml.i
@@ -0,0 +1,13 @@
+<leafNode name="wins-server">
+  <properties>
+    <help>Windows Internet Name Service (WINS) servers propagated to client</help>
+    <valueHelp>
+      <format>ipv4</format>
+      <description>Domain Name Server (DNS) IPv4 address</description>
+    </valueHelp>
+    <constraint>
+      <validator name="ipv4-address"/>
+    </constraint>
+    <multi/>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/service_pppoe-server.xml.in b/interface-definitions/service_pppoe-server.xml.in
index 27669f1c3..6b09b3db4 100644
--- a/interface-definitions/service_pppoe-server.xml.in
+++ b/interface-definitions/service_pppoe-server.xml.in
@@ -255,19 +255,7 @@
               <multi/>
             </properties>
           </leafNode>
-          <leafNode name="wins-server">
-            <properties>
-              <help>Windows Internet Name Service (WINS) servers propagated to client</help>
-              <valueHelp>
-                <format>ipv4</format>
-                <description>Domain Name Server (DNS) IPv4 address</description>
-              </valueHelp>
-              <constraint>
-                <validator name="ipv4-address"/>
-              </constraint>
-              <multi/>
-            </properties>
-          </leafNode>
+          #include <include/accel-wins-server.xml.i>
           <node name="ppp-options">
             <properties>
               <help>Advanced protocol options</help>
diff --git a/interface-definitions/vpn_l2tp.xml.in b/interface-definitions/vpn_l2tp.xml.in
index ab0435172..702ef8b5a 100644
--- a/interface-definitions/vpn_l2tp.xml.in
+++ b/interface-definitions/vpn_l2tp.xml.in
@@ -165,19 +165,7 @@
                   </leafNode>
                 </children>
               </node>
-              <leafNode name="wins-server">
-                <properties>
-                  <help>Windows Internet Name Service (WINS) servers propagated to client</help>
-                  <valueHelp>
-                    <format>ipv4</format>
-                    <description>Domain Name Server (DNS) IPv4 address</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="ipv4-address"/>
-                  </constraint>
-                  <multi/>
-                </properties>
-              </leafNode>
+              #include <include/accel-wins-server.xml.i>
               <node name="client-ip-pool">
                 <properties>
                   <help>Pool of client IP addresses (must be within a /24)</help>
diff --git a/interface-definitions/vpn_pptp.xml.in b/interface-definitions/vpn_pptp.xml.in
index 439fd7259..032455b4d 100644
--- a/interface-definitions/vpn_pptp.xml.in
+++ b/interface-definitions/vpn_pptp.xml.in
@@ -28,60 +28,20 @@
                   </constraint>
                 </properties>
               </leafNode>
-              <node name="dns-servers">
+              <leafNode name="name-server">
                 <properties>
-                  <help>IPv4 Domain Name Service (DNS) server</help>
-                </properties>
-                <children>
-                  <leafNode name="server-1">
-                    <properties>
-                      <help>Primary DNS server</help>
-                      <valueHelp>
-                        <format>ipv4</format>
-                        <description>IPv4 address</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="ipv4-address"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="server-2">
-                    <properties>
-                      <help>Secondary DNS server</help>
-                      <valueHelp>
-                        <format>ipv4</format>
-                        <description>IPv4 address</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="ipv4-address"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
-              <node name="wins-servers">
-                <properties>
-                  <help>Windows Internet Name Service (WINS) server settings</help>
+                  <help>Domain Name Server (DNS) propagated to client</help>
+                  <valueHelp>
+                    <format>ipv4</format>
+                    <description>Domain Name Server (DNS) IPv4 address</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="ipv4-address"/>
+                  </constraint>
+                  <multi/>
                 </properties>
-                <children>
-                  <leafNode name="server-1">
-                    <properties>
-                      <help>Primary WINS server</help>
-                      <constraint>
-                        <validator name="ipv4-address"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="server-2">
-                    <properties>
-                      <help>Secondary WINS server</help>
-                    <constraint>
-                      <validator name="ipv4-address"/>
-                    </constraint>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
+              </leafNode>
+              #include <include/accel-wins-server.xml.i>
               <node name="client-ip-pool">
                 <properties>
                   <help>Pool of client IP addresses (must be within a /24)</help>
@@ -192,39 +152,8 @@
                       </tagNode>
                     </children>
                   </node>
-                  <node name="radius">
-                    <properties>
-                      <help>RADIUS specific configuration</help>
-                    </properties>
-                    <children>
-                      <tagNode name="server">
-                        <properties>
-                          <help>IP address of radius server</help>
-                          <valueHelp>
-                            <format>ipv4</format>
-                            <description>IP address of RADIUS server</description>
-                          </valueHelp>
-                        </properties>
-                        <children>
-                          <leafNode name="key">
-                            <properties>
-                              <help>Key for accessing the specified server</help>
-                            </properties>
-                          </leafNode>
-                          <leafNode name="req-limit">
-                            <properties>
-                              <help>Maximum number of simultaneous requests to server (default: unlimited)</help>
-                            </properties>
-                          </leafNode>
-                          <leafNode name="fail-time">
-                            <properties>
-                              <help>If server does not responds mark it as unavailable for this time (seconds)</help>
-                            </properties>
-                          </leafNode>
-                        </children>
-                      </tagNode>
-                    </children>
-                  </node>
+                  #include <include/radius-server.xml.i>
+                  #include <include/accel-radius-additions.xml.in>
                 </children>
               </node>
             </children>