diff options
| author | Leif Johansson <leifj@sunet.se> | 2015-04-01 08:58:59 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2015-04-01 08:58:59 +0200 |
| commit | 8b5d4875013efe18cffcd91a38fd201e82a92246 (patch) | |
| tree | b16355ad6e1ea14043daa5cde889741e9ddcc9f3 /sto-tug-kvm2.swamid.se/overlay/etc | |
| parent | 82194de4656c118f28365db83f22d50f286fbd18 (diff) | |
| parent | 5cb9279fd0472bec59f5430786a6c684854bcf6f (diff) | |
Merge branch 'master' of git.nordu.net:sunet-ops
Diffstat (limited to 'sto-tug-kvm2.swamid.se/overlay/etc')
| -rw-r--r-- | sto-tug-kvm2.swamid.se/overlay/etc/cron.d/update_eduroam_realm_data | 1 | ||||
| -rw-r--r-- | sto-tug-kvm2.swamid.se/overlay/etc/network/interfaces | 11 |
2 files changed, 3 insertions, 9 deletions
diff --git a/sto-tug-kvm2.swamid.se/overlay/etc/cron.d/update_eduroam_realm_data b/sto-tug-kvm2.swamid.se/overlay/etc/cron.d/update_eduroam_realm_data deleted file mode 100644 index f1dd8e1..0000000 --- a/sto-tug-kvm2.swamid.se/overlay/etc/cron.d/update_eduroam_realm_data +++ /dev/null @@ -1 +0,0 @@ -0 23 * * * root curl https://meta.eduroam.se/institution.xml -so /opt/flog/institution.xml diff --git a/sto-tug-kvm2.swamid.se/overlay/etc/network/interfaces b/sto-tug-kvm2.swamid.se/overlay/etc/network/interfaces index 10cdcf5..8d4bf0b 100644 --- a/sto-tug-kvm2.swamid.se/overlay/etc/network/interfaces +++ b/sto-tug-kvm2.swamid.se/overlay/etc/network/interfaces @@ -18,8 +18,7 @@ iface em1 inet static dns-search swamid.se iface em1 inet6 static - address 2001:6b0:7::9 - netmask 64 + address 2001:6b0:7::9/64 gateway 2001:6b0:7::1 dns-nameservers 2001:6b0:1e:14 2001:6b0:1e:99 @@ -33,9 +32,5 @@ iface em1:0 inet static # dns-* options are implemented by the resolvconf package, if installed dns-nameservers 130.242.80.14 130.242.80.99 dns-search sunet.se - -iface em1:0 inet6 static - address 2001:6b0:7::10 - netmask 64 - gateway 2001:6b0:7::1 - dns-nameservers 2001:6b0:1e:14 2001:6b0:1e:99 + up ip addr add 2001:6b0:7::10/64 dev em1:0 + down ip addr del 2001:6b0:7::10/64 dev em1:0 |