From: Frank Brehm Date: Thu, 25 Jan 2018 02:10:01 +0000 (+0100) Subject: daily autocommit X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=18655a1415a0b5f34717a8ac7fc631e2e8ebcc5a;p=config%2Fberta%2Fetc.git daily autocommit --- diff --git a/.etckeeper b/.etckeeper index 3ce50e1..56f45d5 100755 --- a/.etckeeper +++ b/.etckeeper @@ -14,7 +14,6 @@ mkdir -p './skel/.ssh' mkdir -p './sudoers.d' mkdir -p './systemtap' mkdir -p './udev/hwdb.d' -mkdir -p './udev/rules.d' maybe chmod 0755 '.' maybe chmod 0700 '.etckeeper' maybe chmod 0644 '.gitignore' @@ -1982,7 +1981,8 @@ maybe chmod 0644 'systemd/journal-upload.conf' maybe chmod 0644 'systemd/journald.conf' maybe chmod 0644 'systemd/logind.conf' maybe chmod 0755 'systemd/network' -maybe chmod 0644 'systemd/network/50-static.network' +maybe chmod 0644 'systemd/network/30-static-eth0.network' +maybe chmod 0644 'systemd/network/50-static-enp0s3.network' maybe chmod 0755 'systemd/ntp-units.d' maybe chmod 0644 'systemd/ntp-units.d/.keep_sys-apps_systemd-0' maybe chmod 0644 'systemd/resolved.conf' @@ -2034,6 +2034,7 @@ maybe chmod 0755 'udev' maybe chmod 0444 'udev/hwdb.bin' maybe chmod 0755 'udev/hwdb.d' maybe chmod 0755 'udev/rules.d' +maybe chmod 0644 'udev/rules.d/60-net.rules' maybe chmod 0644 'udev/udev.conf' maybe chmod 0644 'udhcpd.conf' maybe chmod 0644 'updatedb.conf' diff --git a/systemd/network/30-static-eth0.network b/systemd/network/30-static-eth0.network new file mode 100644 index 0000000..838932a --- /dev/null +++ b/systemd/network/30-static-eth0.network @@ -0,0 +1,12 @@ +[Match] +Name=eth0 + +[Network] +Address=192.168.122.149/24 +Gateway=192.168.122.1 +DNS=217.66.52.10 +DNS=212.91.225.75 +Domains=pixelpark.com pixelpark.net brehm-online.com uhu-banane.de uhu-banane.net + +# vim: filetype=dosini + diff --git a/systemd/network/50-static-enp0s3.network b/systemd/network/50-static-enp0s3.network new file mode 100644 index 0000000..70f19fa --- /dev/null +++ b/systemd/network/50-static-enp0s3.network @@ -0,0 +1,11 @@ +[Match] +Name=enp0s3 + +[Network] +Address=192.168.122.149/24 +Gateway=192.168.122.1 +DNS=217.66.52.10 +DNS=212.91.225.75 +Domains=pixelpark.com pixelpark.net brehm-online.com uhu-banane.de uhu-banane.net + +# vim: filetype=dosini diff --git a/systemd/network/50-static.network b/systemd/network/50-static.network deleted file mode 100644 index 70f19fa..0000000 --- a/systemd/network/50-static.network +++ /dev/null @@ -1,11 +0,0 @@ -[Match] -Name=enp0s3 - -[Network] -Address=192.168.122.149/24 -Gateway=192.168.122.1 -DNS=217.66.52.10 -DNS=212.91.225.75 -Domains=pixelpark.com pixelpark.net brehm-online.com uhu-banane.de uhu-banane.net - -# vim: filetype=dosini diff --git a/systemd/system/dbus-org.freedesktop.resolve1.service b/systemd/system/dbus-org.freedesktop.resolve1.service new file mode 120000 index 0000000..8f3f496 --- /dev/null +++ b/systemd/system/dbus-org.freedesktop.resolve1.service @@ -0,0 +1 @@ +/lib/systemd/system/systemd-resolved.service \ No newline at end of file diff --git a/systemd/system/multi-user.target.wants/rsyslog.service b/systemd/system/multi-user.target.wants/rsyslog.service index e5f83a7..c3fe73f 120000 --- a/systemd/system/multi-user.target.wants/rsyslog.service +++ b/systemd/system/multi-user.target.wants/rsyslog.service @@ -1 +1 @@ -/usr/lib64/systemd/system/rsyslog.service \ No newline at end of file +/lib/systemd/system/rsyslog.service \ No newline at end of file diff --git a/systemd/system/multi-user.target.wants/systemd-resolved.service b/systemd/system/multi-user.target.wants/systemd-resolved.service new file mode 120000 index 0000000..8f3f496 --- /dev/null +++ b/systemd/system/multi-user.target.wants/systemd-resolved.service @@ -0,0 +1 @@ +/lib/systemd/system/systemd-resolved.service \ No newline at end of file diff --git a/systemd/system/sysinit.target.wants/systemd-bootchart.service b/systemd/system/sysinit.target.wants/systemd-bootchart.service deleted file mode 120000 index ac77cfb..0000000 --- a/systemd/system/sysinit.target.wants/systemd-bootchart.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib64/systemd/system/systemd-bootchart.service \ No newline at end of file diff --git a/systemd/system/sysinit.target.wants/systemd-timesyncd.service b/systemd/system/sysinit.target.wants/systemd-timesyncd.service index a54997e..f64da56 120000 --- a/systemd/system/sysinit.target.wants/systemd-timesyncd.service +++ b/systemd/system/sysinit.target.wants/systemd-timesyncd.service @@ -1 +1 @@ -/usr/lib64/systemd/system/systemd-timesyncd.service \ No newline at end of file +/lib/systemd/system/systemd-timesyncd.service \ No newline at end of file diff --git a/systemd/system/syslog.service b/systemd/system/syslog.service index e5f83a7..64e7ab5 120000 --- a/systemd/system/syslog.service +++ b/systemd/system/syslog.service @@ -1 +1 @@ -/usr/lib64/systemd/system/rsyslog.service \ No newline at end of file +/lib64/systemd/system/rsyslog.service \ No newline at end of file diff --git a/udev/rules.d/60-net.rules b/udev/rules.d/60-net.rules new file mode 100644 index 0000000..4136e96 --- /dev/null +++ b/udev/rules.d/60-net.rules @@ -0,0 +1 @@ +ACTION=="add", SUBSYSTEM=="net", DRIVERS=="?*", ATTR{address}=="52:54:00:93:b7:3d", NAME="eth0"