From 60a8fb3e35ca46cf6d890a90e9f4a7f090e099f9 Mon Sep 17 00:00:00 2001
From: Aki <please@ignore.pl>
Date: Wed, 5 Apr 2023 21:52:24 +0200
Subject: Configuration files now use .ini extension

---
 .gitignore                      |  2 +-
 contrib/.gitignore              |  2 +-
 contrib/waterspout-pull.service |  2 +-
 contrib/waterspout-radar.conf   |  8 --------
 contrib/waterspout-radar.ini    | 10 ++++++++++
 contrib/waterspout-web.service  |  2 +-
 waterspout_radar/_config.py     |  2 +-
 7 files changed, 15 insertions(+), 13 deletions(-)
 delete mode 100644 contrib/waterspout-radar.conf
 create mode 100644 contrib/waterspout-radar.ini

diff --git a/.gitignore b/.gitignore
index ae42a40..c724fa5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,5 @@ build*/
 dist/
 .venv/
 .env
-*.conf
+*.ini
 *.json
diff --git a/contrib/.gitignore b/contrib/.gitignore
index f8d2b04..a578ca4 100644
--- a/contrib/.gitignore
+++ b/contrib/.gitignore
@@ -1 +1 @@
-!*.conf
+!*.ini
diff --git a/contrib/waterspout-pull.service b/contrib/waterspout-pull.service
index b584688..a212b63 100644
--- a/contrib/waterspout-pull.service
+++ b/contrib/waterspout-pull.service
@@ -3,5 +3,5 @@ Description=Pull data for Waterspout Radar
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/env waterspout-radar -c /etc/waterspout-radar.conf
+ExecStart=/usr/bin/env waterspout-radar -c /etc/waterspout-radar.ini
 User=waterspout
diff --git a/contrib/waterspout-radar.conf b/contrib/waterspout-radar.conf
deleted file mode 100644
index be204b7..0000000
--- a/contrib/waterspout-radar.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-[Waterspout Radar]
-db = /srv/waterspout-radar/db.json
-; key = <Your private Windy API key goes here>
-
-[Locations]
-;; Put desired locations here, by name or by coords:
-; Szczecin
-; 54.372, 18.648
diff --git a/contrib/waterspout-radar.ini b/contrib/waterspout-radar.ini
new file mode 100644
index 0000000..6470d66
--- /dev/null
+++ b/contrib/waterspout-radar.ini
@@ -0,0 +1,10 @@
+; /etc/waterspout-radar.ini
+
+[Waterspout Radar]
+db = /srv/waterspout-radar/db.json
+; key = <Your private Windy API key goes here>
+
+[Locations]
+;; Put desired locations here, by name or by coords:
+; Szczecin
+; 54.372, 18.648
diff --git a/contrib/waterspout-web.service b/contrib/waterspout-web.service
index 377a221..6b7f320 100644
--- a/contrib/waterspout-web.service
+++ b/contrib/waterspout-web.service
@@ -4,7 +4,7 @@ Description=Waterspout Radar Web Interface
 [Service]
 Type=simple
 ExecStart=uwsgi --socket /run/waterspout-radar.sock --module waterspout_radar.web:app --vacuum
-Environment="WATERSPOUT_RADAR_CONFIG=/etc/waterspout-radar.conf"
+Environment="WATERSPOUT_RADAR_CONFIG=/etc/waterspout-radar.ini"
 User=waterspout
 
 [Install]
diff --git a/waterspout_radar/_config.py b/waterspout_radar/_config.py
index 222f023..1e740ae 100644
--- a/waterspout_radar/_config.py
+++ b/waterspout_radar/_config.py
@@ -35,7 +35,7 @@ class ConfigError(Exception):
 
 def effective_pathname(pathname: str = None) -> str:
 	"Pathname of the configuration file based on optional *pathname*, environment, and default."
-	return pathname or os.getenv("WATERSPOUT_RADAR_CONFIG") or "waterspout-radar.conf"
+	return pathname or os.getenv("WATERSPOUT_RADAR_CONFIG") or "waterspout-radar.ini"
 
 
 def load(pathname: str) -> Config:
-- 
cgit v1.1