summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--group_vars/all.yml4
-rw-r--r--host_vars/auth.in.freya.cat.yml1
-rw-r--r--host_vars/ca.in.freya.cat.yml1
-rw-r--r--host_vars/cloud.in.freya.cat.yml1
-rw-r--r--host_vars/cron.in.freya.cat.yml1
-rw-r--r--host_vars/git.in.freya.cat.yml1
-rw-r--r--host_vars/jenkins.in.freya.cat.yml1
-rw-r--r--host_vars/matrix.in.freya.cat.yml1
-rw-r--r--host_vars/minecraft.in.freya.cat.yml1
-rw-r--r--host_vars/plex.in.freya.cat.yml1
-rw-r--r--host_vars/radius.in.freya.cat.yml1
-rw-r--r--host_vars/services.in.freya.cat.yml1
-rw-r--r--host_vars/sip.in.freya.cat.yml1
-rw-r--r--host_vars/vpn.in.freya.cat.yml1
-rw-r--r--host_vars/xmpp.in.freya.cat.yml1
-rw-r--r--roles/common/tasks/caddy.yml2
-rw-r--r--roles/common/tasks/main.yml1
-rw-r--r--roles/common/tasks/network.yml11
-rw-r--r--roles/common/templates/interfaces.j211
19 files changed, 42 insertions, 1 deletions
diff --git a/group_vars/all.yml b/group_vars/all.yml
index a729989..1bb9aef 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -24,3 +24,7 @@ base_packages:
- util-linux
- xauth
- zstd
+
+net_address_prefix: "10.2.2."
+net_netmask: "255.255.0.0"
+net_gateway: "10.2.0.1"
diff --git a/host_vars/auth.in.freya.cat.yml b/host_vars/auth.in.freya.cat.yml
new file mode 100644
index 0000000..847128c
--- /dev/null
+++ b/host_vars/auth.in.freya.cat.yml
@@ -0,0 +1 @@
+net_address_suffix: 1
diff --git a/host_vars/ca.in.freya.cat.yml b/host_vars/ca.in.freya.cat.yml
new file mode 100644
index 0000000..8f44952
--- /dev/null
+++ b/host_vars/ca.in.freya.cat.yml
@@ -0,0 +1 @@
+net_address_suffix: 2
diff --git a/host_vars/cloud.in.freya.cat.yml b/host_vars/cloud.in.freya.cat.yml
new file mode 100644
index 0000000..a7cf125
--- /dev/null
+++ b/host_vars/cloud.in.freya.cat.yml
@@ -0,0 +1 @@
+net_address_suffix: 3
diff --git a/host_vars/cron.in.freya.cat.yml b/host_vars/cron.in.freya.cat.yml
new file mode 100644
index 0000000..005900e
--- /dev/null
+++ b/host_vars/cron.in.freya.cat.yml
@@ -0,0 +1 @@
+net_address_suffix: 15
diff --git a/host_vars/git.in.freya.cat.yml b/host_vars/git.in.freya.cat.yml
new file mode 100644
index 0000000..2d05c0a
--- /dev/null
+++ b/host_vars/git.in.freya.cat.yml
@@ -0,0 +1 @@
+net_address_suffix: 4
diff --git a/host_vars/jenkins.in.freya.cat.yml b/host_vars/jenkins.in.freya.cat.yml
new file mode 100644
index 0000000..cab9852
--- /dev/null
+++ b/host_vars/jenkins.in.freya.cat.yml
@@ -0,0 +1 @@
+net_address_suffix: 16
diff --git a/host_vars/matrix.in.freya.cat.yml b/host_vars/matrix.in.freya.cat.yml
new file mode 100644
index 0000000..3e3e2e0
--- /dev/null
+++ b/host_vars/matrix.in.freya.cat.yml
@@ -0,0 +1 @@
+net_address_suffix: 5
diff --git a/host_vars/minecraft.in.freya.cat.yml b/host_vars/minecraft.in.freya.cat.yml
new file mode 100644
index 0000000..2529d26
--- /dev/null
+++ b/host_vars/minecraft.in.freya.cat.yml
@@ -0,0 +1 @@
+net_address_suffix: 6
diff --git a/host_vars/plex.in.freya.cat.yml b/host_vars/plex.in.freya.cat.yml
new file mode 100644
index 0000000..a444cbe
--- /dev/null
+++ b/host_vars/plex.in.freya.cat.yml
@@ -0,0 +1 @@
+net_address_suffix: 7
diff --git a/host_vars/radius.in.freya.cat.yml b/host_vars/radius.in.freya.cat.yml
new file mode 100644
index 0000000..8aafe60
--- /dev/null
+++ b/host_vars/radius.in.freya.cat.yml
@@ -0,0 +1 @@
+net_address_suffix: 8
diff --git a/host_vars/services.in.freya.cat.yml b/host_vars/services.in.freya.cat.yml
new file mode 100644
index 0000000..bddb6a9
--- /dev/null
+++ b/host_vars/services.in.freya.cat.yml
@@ -0,0 +1 @@
+net_address_suffix: 9
diff --git a/host_vars/sip.in.freya.cat.yml b/host_vars/sip.in.freya.cat.yml
new file mode 100644
index 0000000..f220525
--- /dev/null
+++ b/host_vars/sip.in.freya.cat.yml
@@ -0,0 +1 @@
+net_address_suffix: 10
diff --git a/host_vars/vpn.in.freya.cat.yml b/host_vars/vpn.in.freya.cat.yml
new file mode 100644
index 0000000..ad30b7e
--- /dev/null
+++ b/host_vars/vpn.in.freya.cat.yml
@@ -0,0 +1 @@
+net_address_suffix; 12
diff --git a/host_vars/xmpp.in.freya.cat.yml b/host_vars/xmpp.in.freya.cat.yml
new file mode 100644
index 0000000..2ab0bf1
--- /dev/null
+++ b/host_vars/xmpp.in.freya.cat.yml
@@ -0,0 +1 @@
+net_address_suffix: 11
diff --git a/roles/common/tasks/caddy.yml b/roles/common/tasks/caddy.yml
index 3d2541e..026d9f0 100644
--- a/roles/common/tasks/caddy.yml
+++ b/roles/common/tasks/caddy.yml
@@ -37,7 +37,7 @@
- name: Ensure Caddy log file exists
file:
path: /var/log/caddy.log
- state: touch
+ state: file
owner: caddy
group: caddy
mode: '0664'
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 74088a6..131431a 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -1,5 +1,6 @@
# baseline
- import_tasks: packages.yml
+- import_tasks: network.yml
- import_tasks: certs.yml
# programs
diff --git a/roles/common/tasks/network.yml b/roles/common/tasks/network.yml
new file mode 100644
index 0000000..01277c2
--- /dev/null
+++ b/roles/common/tasks/network.yml
@@ -0,0 +1,11 @@
+- name: Set system hostname
+ hostname:
+ name: "{{ net_hostname | default(inventory_hostname) }}"
+
+- name: Configure interfaces
+ template:
+ src: interfaces.j2
+ dest: /etc/network/interfaces
+ owner: root
+ group: root
+ mode: '0644'
diff --git a/roles/common/templates/interfaces.j2 b/roles/common/templates/interfaces.j2
new file mode 100644
index 0000000..a9bb092
--- /dev/null
+++ b/roles/common/templates/interfaces.j2
@@ -0,0 +1,11 @@
+{% set iface = net_interface
+ | default(ansible_facts.get('default_ipv4', {}).get('interface'))
+ | default('eth0') %}
+auto lo
+iface lo inet loopback
+
+auto {{ iface }}
+iface {{ iface }} inet static
+ address {{ net_address_prefix }}{{ net_address_suffix }}
+ netmask {{ net_netmask }}
+ gateway {{ net_gateway }}