pppoe: T1318: move Jinja2 templates to data/templates folder

This makes the actual code which generates the configs much more human
readable.

3 files changed, 129 insertions, 0 deletions

diff --git a/data/templates/pppoe/ip-pre-up.script.tmpl b/data/templates/pppoe/ip-pre-up.script.tmpl
new file mode 100644
index 000000000..f72781e41
--- /dev/null
+++ b/data/templates/pppoe/ip-pre-up.script.tmpl
@@ -0,0 +1,19 @@
+#!/bin/sh

+

+# As PPPoE is an "on demand" interface we need to re-configure it when it

+# becomes up

+

+if [ "$6" != "{{ intf }}" ]; then

+    exit

+fi

+

+# add some info to syslog

+DIALER_PID=$(cat /var/run/{{ intf }}.pid)

+logger -t pppd[$DIALER_PID] "executing $0"

+

+echo "{{ description }}" > /sys/class/net/{{ intf }}/ifalias

+

+{% if vrf -%}

+logger -t pppd[$DIALER_PID] "configuring dialer interface $6 for VRF {{ vrf }}"

+ip link set dev {{ intf }} master {{ vrf }}

+{% endif %}

diff --git a/data/templates/pppoe/ipv6-up.script.tmpl b/data/templates/pppoe/ipv6-up.script.tmpl
new file mode 100644
index 000000000..037db66db
--- /dev/null
+++ b/data/templates/pppoe/ipv6-up.script.tmpl
@@ -0,0 +1,41 @@
+#!/bin/sh

+

+# As PPPoE is an "on demand" interface we need to re-configure it when it

+# becomes up

+

+if [ "$6" != "{{ intf }}" ]; then

+    exit

+fi

+

+{% if ipv6_autoconf -%}

+# add some info to syslog

+DIALER_PID=$(cat /var/run/{{ intf }}.pid)

+logger -t pppd[$DIALER_PID] "executing $0"

+logger -t pppd[$DIALER_PID] "configuring interface {{ intf }} via $2"

+

+# Configure interface-specific Host/Router behaviour.

+# Note: It is recommended to have the same setting on all interfaces; mixed

+# router/host scenarios are rather uncommon. Possible values are:

+#

+# 0  Forwarding disabled

+# 1  Forwarding enabled

+#

+echo 1 > /proc/sys/net/ipv6/conf/{{ intf }}/forwarding

+

+# Accept Router Advertisements; autoconfigure using them.

+#

+# It also determines whether or not to transmit Router

+# Solicitations. If and only if the functional setting is to

+# accept Router Advertisements, Router Solicitations will be

+# transmitted. Possible values are:

+#

+# 0  Do not accept Router Advertisements.

+# 1  Accept Router Advertisements if forwarding is disabled.

+# 2  Overrule forwarding behaviour. Accept Router Advertisements

+#    even if forwarding is enabled.

+#

+echo 2 > /proc/sys/net/ipv6/conf/{{ intf }}/accept_ra

+

+# Autoconfigure addresses using Prefix Information in Router Advertisements.

+echo 1 > /proc/sys/net/ipv6/conf/{{ intf }}/autoconfigure

+{% endif %}

diff --git a/data/templates/pppoe/peer.tmpl b/data/templates/pppoe/peer.tmpl
new file mode 100644
index 000000000..029361101
--- /dev/null
+++ b/data/templates/pppoe/peer.tmpl
@@ -0,0 +1,69 @@
+### Autogenerated by interfaces-pppoe.py ###

+

+{% if description %}

+# {{ description }}

+{% endif %}

+

+# Require peer to provide the local IP address if it is not

+# specified explicitly in the config file.

+noipdefault

+

+# Don't show the password in logfiles:

+hide-password

+

+# Standard Link Control Protocol (LCP) parameters:

+lcp-echo-interval 20

+lcp-echo-failure 3

+

+# RFC 2516, paragraph 7 mandates that the following options MUST NOT be

+# requested and MUST be rejected if requested by the peer:

+# Address-and-Control-Field-Compression (ACFC)

+noaccomp

+

+# Asynchronous-Control-Character-Map (ACCM)

+default-asyncmap

+

+# Override any connect script that may have been set in /etc/ppp/options.

+connect /bin/true

+

+# Don't try to authenticate the remote node

+noauth

+

+# Don't try to proxy ARP for the remote endpoint. User can set proxy

+# arp entries up manually if they wish.  More importantly, having

+# the "proxyarp" parameter set disables the "defaultroute" option.

+noproxyarp

+

+# Unlimited connection attempts

+maxfail 0

+

+plugin rp-pppoe.so

+{{ source_interface }}

+persist

+ifname {{ intf }}

+ipparam {{ intf }}

+debug

+logfile {{ logfile }}

+{% if 'auto' in default_route -%}

+defaultroute

+{% elif 'force' in default_route -%}

+defaultroute

+replacedefaultroute

+{% endif %}

+mtu {{ mtu }}

+mru {{ mtu }}

+user "{{ auth_username }}"

+password "{{ auth_password }}"

+{% if name_server -%}

+usepeerdns

+{% endif %}

+{% if ipv6_enable -%}

++ipv6

+ipv6cp-use-ipaddr

+{% endif %}

+{% if service_name -%}

+rp_pppoe_service "{{ service_name }}"

+{% endif %}

+{% if on_demand %}

+demand

+{% endif %}