From debf67962283c206481af2c839569e93baad15f2 Mon Sep 17 00:00:00 2001 From: "Rob J. Epping" Date: Sun, 26 Apr 2020 11:14:14 +0000 Subject: [PATCH 1/8] add package acl to required list There are ways to install debian without the acl package. Add it to the required list --- doc/Installation/Installation-Debian-10-Nginx.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Installation/Installation-Debian-10-Nginx.md b/doc/Installation/Installation-Debian-10-Nginx.md index 2c5cf365c9c7..6a64120430f2 100644 --- a/doc/Installation/Installation-Debian-10-Nginx.md +++ b/doc/Installation/Installation-Debian-10-Nginx.md @@ -11,7 +11,7 @@ path: blob/master/doc/ # Install Required Packages ```bash -apt install curl composer fping git graphviz imagemagick mariadb-client mariadb-server mtr-tiny nginx-full nmap php7.3-cli php7.3-curl php7.3-fpm php7.3-gd php7.3-json php7.3-mbstring php7.3-mysql php7.3-snmp php7.3-xml php7.3-zip python-memcache python-mysqldb rrdtool snmp snmpd whois +apt install acl curl composer fping git graphviz imagemagick mariadb-client mariadb-server mtr-tiny nginx-full nmap php7.3-cli php7.3-curl php7.3-fpm php7.3-gd php7.3-json php7.3-mbstring php7.3-mysql php7.3-snmp php7.3-xml php7.3-zip python-memcache python-mysqldb rrdtool snmp snmpd whois ``` # Add librenms user From 7d3d68d66cb4d56a5941b22dcd9f7455c3723448 Mon Sep 17 00:00:00 2001 From: "Rob J. Epping" Date: Sun, 26 Apr 2020 11:17:28 +0000 Subject: [PATCH 2/8] replace systemctl with more generic service Debian does not require systemd. This makes calling systemctl to restart processes a problem. The more generic way in Debian is to call service --- doc/Installation/Installation-Debian-10-Nginx.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/Installation/Installation-Debian-10-Nginx.md b/doc/Installation/Installation-Debian-10-Nginx.md index 6a64120430f2..c895b69e2d93 100644 --- a/doc/Installation/Installation-Debian-10-Nginx.md +++ b/doc/Installation/Installation-Debian-10-Nginx.md @@ -50,7 +50,7 @@ exit ## Configure MySQL ```bash -systemctl restart mysql +service mysql restart mysql -uroot -p ``` @@ -76,7 +76,7 @@ lower_case_table_names=0 ``` ```bash -systemctl restart mysql +service mysql restart ``` # Web Server @@ -94,7 +94,7 @@ nano /etc/php/7.3/cli/php.ini ``` ```bash -systemctl restart php7.3-fpm +service php7.3-fpm restart ``` ## Configure NGINX @@ -134,7 +134,7 @@ server { ``` ```bash -systemctl reload nginx +service nginx reload ``` # Configure snmpd @@ -149,7 +149,7 @@ Edit the text which says `RANDOMSTRINGGOESHERE` and set your own community strin ```bash curl -o /usr/bin/distro https://raw.githubusercontent.com/librenms/librenms-agent/master/snmp/distro chmod +x /usr/bin/distro -systemctl restart snmpd +service snmpd restart ``` # Cron job From 6f4a860a306ed32e7dc06dd82c454c5325e98241 Mon Sep 17 00:00:00 2001 From: "Rob J. Epping" Date: Sun, 26 Apr 2020 11:21:45 +0000 Subject: [PATCH 3/8] rm command allows multiple parameters --- doc/Installation/Installation-Debian-10-Nginx.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Installation/Installation-Debian-10-Nginx.md b/doc/Installation/Installation-Debian-10-Nginx.md index c895b69e2d93..32dd73748056 100644 --- a/doc/Installation/Installation-Debian-10-Nginx.md +++ b/doc/Installation/Installation-Debian-10-Nginx.md @@ -100,7 +100,7 @@ service php7.3-fpm restart ## Configure NGINX ```bash -rm /etc/nginx/sites-available/default && rm /etc/nginx/sites-enabled/default +rm /etc/nginx/sites-available/default /etc/nginx/sites-enabled/default nano /etc/nginx/sites-enabled/librenms.vhost ``` From 7b815e76e8865bc729ff66b5f2ec8a057de3fae7 Mon Sep 17 00:00:00 2001 From: "Rob J. Epping" Date: Sun, 26 Apr 2020 11:23:41 +0000 Subject: [PATCH 4/8] use nginx config in a more Debian way In Debian webservers are configured using -available and -enabled directories. Make better use of this stucture. --- doc/Installation/Installation-Debian-10-Nginx.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/Installation/Installation-Debian-10-Nginx.md b/doc/Installation/Installation-Debian-10-Nginx.md index 32dd73748056..e66cf88c0383 100644 --- a/doc/Installation/Installation-Debian-10-Nginx.md +++ b/doc/Installation/Installation-Debian-10-Nginx.md @@ -100,8 +100,8 @@ service php7.3-fpm restart ## Configure NGINX ```bash -rm /etc/nginx/sites-available/default /etc/nginx/sites-enabled/default -nano /etc/nginx/sites-enabled/librenms.vhost +rm /etc/nginx/sites-enabled/default +nano /etc/nginx/sites-available/librenms.vhost ``` Add the following config, edit `server_name` as required: @@ -134,6 +134,7 @@ server { ``` ```bash +ln -s /etc/nginx/sites-available/librenms.vhost /etc/nginx/sites-enabled/librenms.vhost service nginx reload ``` From 4c11ae4fa80818828f60c5c19c543355ea4663a2 Mon Sep 17 00:00:00 2001 From: "Rob J. Epping" Date: Sun, 26 Apr 2020 11:27:29 +0000 Subject: [PATCH 5/8] better snmpd.conf handling Instead of overwriting snmpd.conf inform Debian of the change. Because snmpd.conf contains sensitive info make it only user accessible --- doc/Installation/Installation-Debian-10-Nginx.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/Installation/Installation-Debian-10-Nginx.md b/doc/Installation/Installation-Debian-10-Nginx.md index e66cf88c0383..01f61bfbd605 100644 --- a/doc/Installation/Installation-Debian-10-Nginx.md +++ b/doc/Installation/Installation-Debian-10-Nginx.md @@ -141,7 +141,9 @@ service nginx reload # Configure snmpd ```bash +dpkg-divert --rename /etc/snmp/snmpd.conf cp /opt/librenms/snmpd.conf.example /etc/snmp/snmpd.conf +chmod 600 /etc/snmp/snmpd.conf nano /etc/snmp/snmpd.conf ``` From f304da65028f4210b85b889e39141a0055af2d02 Mon Sep 17 00:00:00 2001 From: "Rob J. Epping" Date: Sun, 26 Apr 2020 11:30:04 +0000 Subject: [PATCH 6/8] replace nano with users preferred editor --- doc/Installation/Installation-Debian-10-Nginx.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/Installation/Installation-Debian-10-Nginx.md b/doc/Installation/Installation-Debian-10-Nginx.md index 01f61bfbd605..f05cf72af27b 100644 --- a/doc/Installation/Installation-Debian-10-Nginx.md +++ b/doc/Installation/Installation-Debian-10-Nginx.md @@ -65,7 +65,7 @@ exit ``` ```bash -nano /etc/mysql/mariadb.conf.d/50-server.cnf +editor /etc/mysql/mariadb.conf.d/50-server.cnf ``` Within the `[mysqld]` section please add: @@ -89,8 +89,8 @@ timezones. Valid examples are: "America/New_York", "Australia/Brisbane", "Etc/UTC". ```bash -nano /etc/php/7.3/fpm/php.ini -nano /etc/php/7.3/cli/php.ini +editor /etc/php/7.3/fpm/php.ini +editor /etc/php/7.3/cli/php.ini ``` ```bash @@ -101,7 +101,7 @@ service php7.3-fpm restart ```bash rm /etc/nginx/sites-enabled/default -nano /etc/nginx/sites-available/librenms.vhost +editor /etc/nginx/sites-available/librenms.vhost ``` Add the following config, edit `server_name` as required: @@ -144,7 +144,7 @@ service nginx reload dpkg-divert --rename /etc/snmp/snmpd.conf cp /opt/librenms/snmpd.conf.example /etc/snmp/snmpd.conf chmod 600 /etc/snmp/snmpd.conf -nano /etc/snmp/snmpd.conf +editor /etc/snmp/snmpd.conf ``` Edit the text which says `RANDOMSTRINGGOESHERE` and set your own community string. From 97c96e3482b2af095381f7d4c13768a379ac24b0 Mon Sep 17 00:00:00 2001 From: "Rob J. Epping" Date: Sat, 6 Jun 2020 18:02:58 +0200 Subject: [PATCH 7/8] revert back to nano as editor --- doc/Installation/Installation-Debian-10-Nginx.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/Installation/Installation-Debian-10-Nginx.md b/doc/Installation/Installation-Debian-10-Nginx.md index 2c87c4a9306a..89f1ee264b76 100644 --- a/doc/Installation/Installation-Debian-10-Nginx.md +++ b/doc/Installation/Installation-Debian-10-Nginx.md @@ -65,7 +65,7 @@ exit ``` ```bash -editor /etc/mysql/mariadb.conf.d/50-server.cnf +nano /etc/mysql/mariadb.conf.d/50-server.cnf ``` Within the `[mysqld]` section please add: @@ -89,8 +89,8 @@ timezones. Valid examples are: "America/New_York", "Australia/Brisbane", "Etc/UTC". ```bash -editor /etc/php/7.3/fpm/php.ini -editor /etc/php/7.3/cli/php.ini +nano /etc/php/7.3/fpm/php.ini +nano /etc/php/7.3/cli/php.ini ``` ```bash @@ -101,7 +101,7 @@ service php7.3-fpm restart ```bash rm /etc/nginx/sites-enabled/default -editor /etc/nginx/sites-available/librenms.vhost +nano /etc/nginx/sites-available/librenms.vhost ``` Add the following config, edit `server_name` as required: @@ -144,7 +144,7 @@ service nginx reload dpkg-divert --rename /etc/snmp/snmpd.conf cp /opt/librenms/snmpd.conf.example /etc/snmp/snmpd.conf chmod 600 /etc/snmp/snmpd.conf -editor /etc/snmp/snmpd.conf +nano /etc/snmp/snmpd.conf ``` Edit the text which says `RANDOMSTRINGGOESHERE` and set your own community string. From e85e3d372c08ab3de82290399005fd22678b5034 Mon Sep 17 00:00:00 2001 From: "Rob J. Epping" Date: Sat, 6 Jun 2020 18:09:51 +0200 Subject: [PATCH 8/8] remove dpkg-divert as per PR discussion --- doc/Installation/Installation-Debian-10-Nginx.md | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/Installation/Installation-Debian-10-Nginx.md b/doc/Installation/Installation-Debian-10-Nginx.md index 89f1ee264b76..deb7b497e417 100644 --- a/doc/Installation/Installation-Debian-10-Nginx.md +++ b/doc/Installation/Installation-Debian-10-Nginx.md @@ -141,7 +141,6 @@ service nginx reload # Configure snmpd ```bash -dpkg-divert --rename /etc/snmp/snmpd.conf cp /opt/librenms/snmpd.conf.example /etc/snmp/snmpd.conf chmod 600 /etc/snmp/snmpd.conf nano /etc/snmp/snmpd.conf