From a09ad8d837bbbecf160b5cfd14cc63be91593033 Mon Sep 17 00:00:00 2001 From: mhoellein Date: Thu, 12 Nov 2020 00:27:17 +0100 Subject: [PATCH] daily autocommit --- .etckeeper | 3 +- init.d/fhem | 75 --------------------------- letsencrypt/csr/2246_csr-certbot.pem | 16 ++++++ letsencrypt/keys/2246_key-certbot.pem | 28 ++++++++++ rc2.d/{S02fhem => K01fhem} | 0 rc3.d/{S02fhem => K01fhem} | 0 rc4.d/{S02fhem => K01fhem} | 0 rc5.d/{S02fhem => K01fhem} | 0 systemd/system/fhem.service | 19 +++++-- 9 files changed, 60 insertions(+), 81 deletions(-) delete mode 100755 init.d/fhem create mode 100644 letsencrypt/csr/2246_csr-certbot.pem create mode 100644 letsencrypt/keys/2246_key-certbot.pem rename rc2.d/{S02fhem => K01fhem} (100%) rename rc3.d/{S02fhem => K01fhem} (100%) rename rc4.d/{S02fhem => K01fhem} (100%) rename rc5.d/{S02fhem => K01fhem} (100%) diff --git a/.etckeeper b/.etckeeper index faac6f8b..fd052ffc 100755 --- a/.etckeeper +++ b/.etckeeper @@ -2936,7 +2936,6 @@ maybe chmod 0755 'init.d/docker' maybe chmod 0755 'init.d/dovecot' maybe chmod 0755 'init.d/fail2ban' maybe chmod 0755 'init.d/fetchmail' -maybe chmod 0755 'init.d/fhem' maybe chmod 0755 'init.d/grub-common' maybe chmod 0755 'init.d/halt' maybe chmod 0755 'init.d/hddtemp' @@ -5805,6 +5804,7 @@ maybe chmod 0644 'letsencrypt/csr/2242_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/2243_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/2244_csr-certbot.pem' maybe chmod 0644 'letsencrypt/csr/2245_csr-certbot.pem' +maybe chmod 0644 'letsencrypt/csr/2246_csr-certbot.pem' maybe chmod 0700 'letsencrypt/keys' maybe chmod 0600 'letsencrypt/keys/0000_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/0001_key-certbot.pem' @@ -8052,6 +8052,7 @@ maybe chmod 0600 'letsencrypt/keys/2242_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/2243_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/2244_key-certbot.pem' maybe chmod 0600 'letsencrypt/keys/2245_key-certbot.pem' +maybe chmod 0600 'letsencrypt/keys/2246_key-certbot.pem' maybe chmod 0755 'letsencrypt/live' maybe chmod 0755 'letsencrypt/live/ccu.hoellein.online' maybe chmod 0644 'letsencrypt/live/ccu.hoellein.online/README' diff --git a/init.d/fhem b/init.d/fhem deleted file mode 100755 index ed9ecc60..00000000 --- a/init.d/fhem +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/sh -# description: Start or stop the fhem server -# Added by Alex Peuchert - -### BEGIN INIT INFO -# Provides: fhem.pl -# Required-Start: $local_fs $remote_fs -# Required-Stop: $local_fs $remote_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: FHEM server -### END INIT INFO - -set -e -cd /opt/fhem -port=7072 - -if test "$2" != "noaptmark"; then - apt-mark hold fhem > /dev/null -fi - -case "$1" in -'start') - - echo "Starting fhem..." - -# if you need to start hmland for use with -# Homematic, please start the hmland daemon -# like this (please use correct path and port, -# depending on your installation!) -# -# /opt/hmcfgusb/hmland -d -p 1234 -r 0 -# - - perl fhem.pl configDB - -# if you want to use configDB for configuration, -# use this command to start fhem: -# -# perl fhem.pl configDB -# -# and remove/comment the above line including fhem.cfg - - RETVAL=$? - ;; -'stop') - echo "Stopping fhem..." - -# if you want to stop hmland during fhem stop: -# pkill hmland - - pkill -U fhem perl - RETVAL=$? - ;; -'status') - cnt=`ps -ef | grep "fhem.pl" | grep -v grep | wc -l` - if [ "$cnt" -eq "0" ] ; then - echo "fhem is not running" - else - echo "fhem is running" - fi - ;; -'restart') - echo "Restarting fhem..." - $0 stop - sleep 5 - $0 start - RETVAL=$? - ;; -*) - echo "Usage: $0 { start | stop | status | restart}" - RETVAL=1 - ;; -esac -exit $RETVAL diff --git a/letsencrypt/csr/2246_csr-certbot.pem b/letsencrypt/csr/2246_csr-certbot.pem new file mode 100644 index 00000000..ef39541f --- /dev/null +++ b/letsencrypt/csr/2246_csr-certbot.pem @@ -0,0 +1,16 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICdTCCAV0CAQIwADCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALe3 +g3ph3jQtk5c6SNFyzL2FP1kon6a5SxcATEASEFZqRP+iu77wIqQPT5awNm+uLVtj +quxwy9kI1Y27l9atZix7/3SNVtGsDu6/7VLkhtGeSMGpkkP3J3lV76bpbaSHMSF2 +H4eVV6H9DeBRYmy5OuJejuJC9cXoA1cIwGXPwqn17SilJws7pLKC0oSqW/iKX4D2 +NLYdaHL5EskN1rts+aJiY+R/RUZtZowSeLPxjWSUVLKtdodTjkqPxgn+n77ixFn0 +O7AU0W1B2FCWhLzLY+/B3fIl/IAE1au7K4uevR5lc+rg2MYL5aqT7ptPfqal8F7T +WAbppatJJ41rp6/7UgUCAwEAAaAwMC4GCSqGSIb3DQEJDjEhMB8wHQYDVR0RBBYw +FIISdHYuaG9lbGxlaW4ub25saW5lMA0GCSqGSIb3DQEBCwUAA4IBAQAse2bJrvnl +VcIQiRYBn+N6VNNr4MuYPNeIQ/2vEP7HIbT9cz1vMqBMTIDfPvR4H9KyLpsvizeI ++vjznJ9OIVMW3W6zGIlU0tFb5J3wKpGsMOjB+jtb0KFb2rjPtlDbctFdoNOZ2vqS +V91W8dmPPQ04G/NIx/h1eYFfaFA1xUYOjptEndZFtw29i8dleJUUlCCisE6IfZ7Q +B6qhkwzmnxkrYUwhdwx9TdzSZRq0jWDpkAa54JGBJ5UsMXTn1GHkqEHDHnZENEaZ +rHDPRreINdDUfXbwHfjTX86YjH7SU6Y7mw6tNIhqp6LmZLX2TB0ZeNJc6S5iFh8y +rNWqPOOBa/+T +-----END CERTIFICATE REQUEST----- diff --git a/letsencrypt/keys/2246_key-certbot.pem b/letsencrypt/keys/2246_key-certbot.pem new file mode 100644 index 00000000..000740e3 --- /dev/null +++ b/letsencrypt/keys/2246_key-certbot.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC3t4N6Yd40LZOX +OkjRcsy9hT9ZKJ+muUsXAExAEhBWakT/oru+8CKkD0+WsDZvri1bY6rscMvZCNWN +u5fWrWYse/90jVbRrA7uv+1S5IbRnkjBqZJD9yd5Ve+m6W2khzEhdh+HlVeh/Q3g +UWJsuTriXo7iQvXF6ANXCMBlz8Kp9e0opScLO6SygtKEqlv4il+A9jS2HWhy+RLJ +Dda7bPmiYmPkf0VGbWaMEniz8Y1klFSyrXaHU45Kj8YJ/p++4sRZ9DuwFNFtQdhQ +loS8y2Pvwd3yJfyABNWruyuLnr0eZXPq4NjGC+Wqk+6bT36mpfBe01gG6aWrSSeN +a6ev+1IFAgMBAAECggEAaFe8Pvfy4iO4nb2muf6/tixFzHe8JU88DLZImGMqEEqP +IbnldA6jPhbMF0PBxzBf5nX3EA8IWB4iXDtdg7o8O6u5bRMRakiUupkbS2csA0Yp +AIU045EuREXAtUYC1d1K1Dxor/LsML6u8OaIRkP147fc4zkwqdSagQYhcDHN2AUz +vjmKaAMEG3VPzlfhKX5VaeHHL2q49Zl9hilASm4ySV4SINZ9JEmpPZk4s21Ph0eA +0AtEZW+J0wgZ8OLoz8xFb/+pwlnU5Ix6OgaXlg0OFD4ZjmZ52ltyg9oQcojjJW6M +5e5FURgfey5P9BqI/STqk+joKs3yNWXOYX2+s+MxCQKBgQDvabiEl5rB2rYXwQXy +2oakSoVK9pribU1OOHLRrcaMv52+bBC3dnQgDpY2KiO1xMRuvPExwpCOkwDGP50d +lbixux7TLlLCY9Y88TyqpMJ3uB47NQ9eVwRzZh+B4gBUdrRqGvg1qovzDHOQNbef +Ymfa3d0AJfexXP7DQOyy+l0kBwKBgQDEcfRf3YVR1M4YrJAf/A5iqxPvAhYPcv67 +a4QSocqYy7Y4dBEyY6ivrp28/1DJRf8iJHm0I/ZvYPEi+EbIsXHIzr/iAeQ7bCyM +GcHbxIIbJ8Am3mA/i6HBT+gj41q4nMkipqKBBrEedevNSg1AnXXH+SHWRzcN05DO +hal/7e7OkwKBgQC1xkBJs83Vh9ifundox1BZJxeDLi+04SZD0Iok91r7/HSpYuVi +Vnae7FRSdbY9SVOXfK9oh4A4MBbzbtM85jOgBiHGV7KQUzsTdFoKeiQIv+t8KrIr +f8gqUgx0EgMMHkCnGyj/nii59ec8Q/zR7+ZIgBFPDoS8zo3D8+SDk6HqOwKBgCpD +qiQF8O0OL9k3Jzr6a83mqL8/X6erQgrost2fWYtOKMI0lo6UynIhy2YiOCtVl/Ks +jlKnehm0bazsZa5AHw7pDHd/mK8AMwVhdUfnG2bkQn8aUPLbA84ndvZhr98QPGXs +HAJOgkTfcgAU8oz4U6LWguUrJTkgT4NfVnxjoIFpAoGBAI+Pu0NQFWta2Isr6j3f +7aMrGUApmj0H6zcfmyx7Ef+j/giwZ3v2xUqpUJ7rua2RIfYm5BiDe4PFwjPuoHU/ +eKPKNzG8w+1yOkKizvMSvV+dpgQiLySGliQN7bYjTlPsHO8Y6PYt3Nm8oZjtZix3 +UgVpYOkw6kWZiq8+l8ZMYau0 +-----END PRIVATE KEY----- diff --git a/rc2.d/S02fhem b/rc2.d/K01fhem similarity index 100% rename from rc2.d/S02fhem rename to rc2.d/K01fhem diff --git a/rc3.d/S02fhem b/rc3.d/K01fhem similarity index 100% rename from rc3.d/S02fhem rename to rc3.d/K01fhem diff --git a/rc4.d/S02fhem b/rc4.d/K01fhem similarity index 100% rename from rc4.d/S02fhem rename to rc4.d/K01fhem diff --git a/rc5.d/S02fhem b/rc5.d/K01fhem similarity index 100% rename from rc5.d/S02fhem rename to rc5.d/K01fhem diff --git a/systemd/system/fhem.service b/systemd/system/fhem.service index d6386e69..9321c899 100644 --- a/systemd/system/fhem.service +++ b/systemd/system/fhem.service @@ -1,13 +1,22 @@ +# $Id: fhem.service 19235 2019-04-21 13:26:17Z betateilchen $ + [Unit] Description=FHEM Home Automation +Wants=network.target +After=network.target +#Requires=postgresql.service +#After=postgresql.service +Requires=mysql.service +After=mysql.service [Service] Type=forking -#ExecStartPre=/opt/hmusbcfg/hmland -d -p 1234 -r 0 -ExecStart=/etc/init.d/fhem start -ExecStop=/etc/init.d/fhem stop -Restart=on-failure -RestartSec=50 +User=fhem +Group=dialout +WorkingDirectory=/opt/fhem +#ExecStart=/usr/bin/perl fhem.pl fhem.cfg +ExecStart=/usr/bin/perl fhem.pl configDB +Restart=always [Install] WantedBy=multi-user.target -- 2.43.0