From 9b8e3e36b1f99bb009ca5b701a4e28bcef1042af Mon Sep 17 00:00:00 2001
From: Brian Cunnie <brian.cunnie@gmail.com>
Date: Thu, 24 Mar 2022 07:21:03 -0700
Subject: [PATCH] etcd on Azure: conform to Ubuntu's defaults

...because it's different than Fedora's defaults
---
 etcd/README.md       | 4 ++--
 etcd/etcd-azure.conf | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/etcd/README.md b/etcd/README.md
index 651d5bd..f36960b 100644
--- a/etcd/README.md
+++ b/etcd/README.md
@@ -78,11 +78,11 @@ Now let's set up etcd on ns-azure:
 
 ```shell
 ssh ns-azure.sslip.io
-cd /etc/etcd
+sudo mkdir /etc/etcd # default's okay: root:root 755
 lpass login brian.cunnie@gmail.com --trust
 sudo curl -OL https://raw.githubusercontent.com/cunnie/sslip.io/main/etcd/ca.pem
 sudo curl -OL https://raw.githubusercontent.com/cunnie/sslip.io/main/etcd/etcd.pem
-sudo curl -o etcd.conf -L https://raw.githubusercontent.com/cunnie/sslip.io/main/etcd/etcd-azure.conf
+sudo curl -o /etc/default/etcd -L https://raw.githubusercontent.com/cunnie/sslip.io/main/etcd/etcd-azure.conf
 lpass show --note etcd-ca-key.pem | sudo tee ca-key.pem
 lpass show --note etcd-key.pem | sudo tee etcd-key.pem
 sudo chmod 400 *key*
diff --git a/etcd/etcd-azure.conf b/etcd/etcd-azure.conf
index b6460c4..cfdd400 100644
--- a/etcd/etcd-azure.conf
+++ b/etcd/etcd-azure.conf
@@ -1,6 +1,6 @@
 # [member]
 ETCD_NAME=ns-azure
-ETCD_DATA_DIR="/var/lib/etcd/default.etcd"
+ETCD_DATA_DIR="/var/lib/etcd/default"
 #ETCD_WAL_DIR=""
 #ETCD_SNAPSHOT_COUNT="10000"
 #ETCD_HEARTBEAT_INTERVAL="100"