summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-08-26 14:23:30 +0200
committerErich Eckner <git@eckner.net>2019-08-26 14:23:30 +0200
commitcc470395f7109dd472801200ce11b963738885d8 (patch)
tree8b981bfa783380b77d33cf524d722947ab34cd99
parentcff3db2958493fd336c3e47003ac17bd9155e64d (diff)
downloadsimple-pki-cc470395f7109dd472801200ce11b963738885d8.tar.xz
unify names
-rw-r--r--.gitignore4
-rw-r--r--Makefile10
-rw-r--r--generate-and-upload-self-signed-key.service.in6
-rw-r--r--generate-and-upload-self-signed-keys.conf (renamed from generate-and-upload-self-signed-key.conf)0
-rwxr-xr-xgenerate-and-upload-self-signed-keys.in (renamed from generate-and-upload-self-signed-key.in)0
-rw-r--r--generate-and-upload-self-signed-keys.service.in6
-rw-r--r--generate-and-upload-self-signed-keys.timer (renamed from generate-and-upload-self-signed-key.timer)2
7 files changed, 14 insertions, 14 deletions
diff --git a/.gitignore b/.gitignore
index 1e18721..801b64b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-generate-and-upload-self-signed-key
-generate-and-upload-self-signed-key.service
+generate-and-upload-self-signed-keys
+generate-and-upload-self-signed-keys.service
diff --git a/Makefile b/Makefile
index 6c70825..29a86a8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
#
-# generate-and-upload-self-signed-key - script to handle self signed keys
+# generate-and-upload-self-signed-keys - script to handle self signed keys
#
# Copyright (c) 2019 Erich Eckner <opensource at eckner dot net>
#
@@ -27,7 +27,7 @@ MANDIR = /usr/share/man
VERSION = 0.0
-all: generate-and-upload-self-signed-key generate-and-upload-self-signed-key.service
+all: generate-and-upload-self-signed-keys generate-and-upload-self-signed-keys.service
%: %.in
sed " \
@@ -41,9 +41,9 @@ all: generate-and-upload-self-signed-key generate-and-upload-self-signed-key.ser
.PHONY: install dist clean
install:
- install -D -m0755 generate-and-upload-self-signed-key $(DESTDIR)$(BINDIR)/generate-and-upload-self-signed-key
- install -D -m0644 generate-and-upload-self-signed-key.conf $(DESTDIR)$(ETCDIR)/generate-and-upload-self-signed-key.conf
- install -D -m0644 -t $(DESTDIR)$(LIBDIR)/systemd/system generate-and-upload-self-signed-key.service generate-and-upload-self-signed-key.timer
+ install -D -m0755 generate-and-upload-self-signed-keys $(DESTDIR)$(BINDIR)/generate-and-upload-self-signed-keys
+ install -D -m0644 generate-and-upload-self-signed-keys.conf $(DESTDIR)$(ETCDIR)/generate-and-upload-self-signed-keys.conf
+ install -D -m0644 -t $(DESTDIR)$(LIBDIR)/systemd/system generate-and-upload-self-signed-keys.service generate-and-upload-self-signed-keys.timer
clean:
ls -A | \
diff --git a/generate-and-upload-self-signed-key.service.in b/generate-and-upload-self-signed-key.service.in
deleted file mode 100644
index 086e5cd..0000000
--- a/generate-and-upload-self-signed-key.service.in
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=generate and manage a self-signed key
-
-[Service]
-Type=oneshot
-ExecStart=#BINDIR#/generate-and-manage-self-signed-key
diff --git a/generate-and-upload-self-signed-key.conf b/generate-and-upload-self-signed-keys.conf
index a83ab66..a83ab66 100644
--- a/generate-and-upload-self-signed-key.conf
+++ b/generate-and-upload-self-signed-keys.conf
diff --git a/generate-and-upload-self-signed-key.in b/generate-and-upload-self-signed-keys.in
index 76331d9..76331d9 100755
--- a/generate-and-upload-self-signed-key.in
+++ b/generate-and-upload-self-signed-keys.in
diff --git a/generate-and-upload-self-signed-keys.service.in b/generate-and-upload-self-signed-keys.service.in
new file mode 100644
index 0000000..2f851c4
--- /dev/null
+++ b/generate-and-upload-self-signed-keys.service.in
@@ -0,0 +1,6 @@
+[Unit]
+Description=generate and manage self-signed keys
+
+[Service]
+Type=oneshot
+ExecStart=#BINDIR#/generate-and-manage-self-signed-keys
diff --git a/generate-and-upload-self-signed-key.timer b/generate-and-upload-self-signed-keys.timer
index 77132d7..308a8e6 100644
--- a/generate-and-upload-self-signed-key.timer
+++ b/generate-and-upload-self-signed-keys.timer
@@ -1,5 +1,5 @@
[Unit]
-Description=generate and upload a self-signed key twice a year
+Description=generate and upload self-signed keys twice a year
[Timer]
OnCalendar=*-01,05,09-01 00:00:00