Makussu/bunkerweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update linux docs, minor fix in ingress example and update default value for bunkernet job

Browse Source
This commit is contained in:
florian 2022-06-14 13:49:22 +02:00
parent 0ef82619b8
commit db4e2cf266
No known key found for this signature in database
GPG Key ID: 3D80806F12602A7C
4 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/bunkernet/jobs/bunkernet-register.py
View File

@ -18,11 +18,11 @@ try :
# Multisite case # Multisite case
if os.getenv("MULTISITE") == "yes" : if os.getenv("MULTISITE") == "yes" :
for first_server in os.getenv("SERVER_NAME").split(" ") : for first_server in os.getenv("SERVER_NAME").split(" ") :
if os.getenv(first_server + "_USE_BUNKERNET", os.getenv("USE_BUNKERNET")) == "yes" : if os.getenv(first_server + "_USE_BUNKERNET", os.getenv("USE_BUNKERNET", "yes")) == "yes" :
bunkernet_activated = True bunkernet_activated = True
break break
# Singlesite case # Singlesite case
elif os.getenv("USE_BUNKERNET") == "yes" : elif os.getenv("USE_BUNKERNET", "yes") == "yes" :
bunkernet_activated = True bunkernet_activated = True
if not bunkernet_activated : if not bunkernet_activated :
logger.log("BUNKERNET", "ℹ️", "BunkerNet is not activated, skipping registration...") logger.log("BUNKERNET", "ℹ️", "BunkerNet is not activated, skipping registration...")

26
docs/integrations.md
View File

@ -683,7 +683,7 @@ Repositories of Linux packages for BunkerWeb are available on [PackageCloud](htt
The first step is to add NGINX official repository : The first step is to add NGINX official repository :
```shell ```shell
sudo apt install curl gnupg2 ca-certificates lsb-release debian-archive-keyring && \ sudo apt install -y curl gnupg2 ca-certificates lsb-release debian-archive-keyring && \
curl https://nginx.org/keys/nginx_signing.key | gpg --dearmor \ curl https://nginx.org/keys/nginx_signing.key | gpg --dearmor \
| sudo tee /usr/share/keyrings/nginx-archive-keyring.gpg >/dev/null && \ | sudo tee /usr/share/keyrings/nginx-archive-keyring.gpg >/dev/null && \
echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] \ echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] \
@ -694,14 +694,14 @@ Repositories of Linux packages for BunkerWeb are available on [PackageCloud](htt
You should now be able to install NGINX 1.20.2 : You should now be able to install NGINX 1.20.2 :
```shell ```shell
sudo apt update && \ sudo apt update && \
sudo apt install nginx=1.20.2-1~bullseye sudo apt install -y nginx=1.20.2-1~bullseye
``` ```
And finally install BunkerWeb 1.4.0 : And finally install BunkerWeb 1.4.0 :
```shell ```shell
curl -s https://packagecloud.io/install/repositories/bunkerity/bunkerweb/script.deb.sh | sudo bash && \ curl -s https://packagecloud.io/install/repositories/bunkerity/bunkerweb/script.deb.sh | sudo bash && \
apt update && \ sudo apt update && \
apt install -y bunkerweb=1.4.0 sudo apt install -y bunkerweb=1.4.0
``` ```
To prevent upgrading NGINX and/or BunkerWeb packages when executing `apt upgrade`, you can use the following command : To prevent upgrading NGINX and/or BunkerWeb packages when executing `apt upgrade`, you can use the following command :
@ -713,7 +713,7 @@ Repositories of Linux packages for BunkerWeb are available on [PackageCloud](htt
The first step is to add NGINX official repository : The first step is to add NGINX official repository :
```shell ```shell
sudo apt install curl gnupg2 ca-certificates lsb-release ubuntu-keyring && \ sudo apt install -y curl gnupg2 ca-certificates lsb-release ubuntu-keyring && \
curl https://nginx.org/keys/nginx_signing.key | gpg --dearmor \ curl https://nginx.org/keys/nginx_signing.key | gpg --dearmor \
| sudo tee /usr/share/keyrings/nginx-archive-keyring.gpg >/dev/null && \ | sudo tee /usr/share/keyrings/nginx-archive-keyring.gpg >/dev/null && \
echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] \ echo "deb [signed-by=/usr/share/keyrings/nginx-archive-keyring.gpg] \
@ -724,14 +724,14 @@ Repositories of Linux packages for BunkerWeb are available on [PackageCloud](htt
You should now be able to install NGINX 1.20.2 : You should now be able to install NGINX 1.20.2 :
```shell ```shell
sudo apt update && \ sudo apt update && \
sudo apt install nginx=1.20.2-1~jammy sudo apt install -y nginx=1.20.2-1~jammy
``` ```
And finally install BunkerWeb 1.4.0 : And finally install BunkerWeb 1.4.0 :
```shell ```shell
curl -s https://packagecloud.io/install/repositories/bunkerity/bunkerweb/script.deb.sh | sudo bash && \ curl -s https://packagecloud.io/install/repositories/bunkerity/bunkerweb/script.deb.sh | sudo bash && \
apt update && \ sudo apt update && \
apt install -y bunkerweb=1.4.0 sudo apt install -y bunkerweb=1.4.0
``` ```
To prevent upgrading NGINX and/or BunkerWeb packages when executing `apt upgrade`, you can use the following command : To prevent upgrading NGINX and/or BunkerWeb packages when executing `apt upgrade`, you can use the following command :
@ -743,13 +743,13 @@ Repositories of Linux packages for BunkerWeb are available on [PackageCloud](htt
Fedora already provides NGINX 1.20.2 that we support : Fedora already provides NGINX 1.20.2 that we support :
```shell ```shell
sudo dnf install nginx-1.20.2 sudo dnf install -y nginx-1.20.2
``` ```
```shell ```shell
curl -s https://packagecloud.io/install/repositories/bunkerity/bunkerweb/script.rpm.sh | sudo bash && \ curl -s https://packagecloud.io/install/repositories/bunkerity/bunkerweb/script.rpm.sh | sudo bash && \
dnf check-update && \ sudo dnf check-update && \
dnf install -y bunkerweb-1.4.0 sudo dnf install -y bunkerweb-1.4.0
``` ```
To prevent upgrading NGINX and/or BunkerWeb packages when executing `dnf upgrade`, you can use the following command : To prevent upgrading NGINX and/or BunkerWeb packages when executing `dnf upgrade`, you can use the following command :
@ -780,8 +780,8 @@ Repositories of Linux packages for BunkerWeb are available on [PackageCloud](htt
```shell ```shell
dnf install -y epel-release && \ dnf install -y epel-release && \
curl -s https://packagecloud.io/install/repositories/bunkerity/bunkerweb/script.rpm.sh | sudo bash && \ curl -s https://packagecloud.io/install/repositories/bunkerity/bunkerweb/script.rpm.sh | sudo bash && \
dnf check-update && \ sudo dnf check-update && \
dnf install -y bunkerweb-1.4.0 sudo dnf install -y bunkerweb-1.4.0
``` ```
To prevent upgrading NGINX and/or BunkerWeb packages when executing `dnf upgrade`, you can use the following command : To prevent upgrading NGINX and/or BunkerWeb packages when executing `dnf upgrade`, you can use the following command :

7
docs/troubleshooting.md
View File

@ -75,7 +75,12 @@ Here is how you can access the logs depending on your integration :
=== "Linux" === "Linux"
The logs are located inside the `/var/log/nginx` directory. There is two files : For errors related to BunkerWeb services (e.g. not starting), you can use `journalctl` :
```shell
journalctl -u bunkerweb --no-pager
```
Common logs are located inside the `/var/log/nginx` directory :
```shell ```shell
cat /var/log/nginx/error.log cat /var/log/nginx/error.log
cat /var/log/nginx/access.log cat /var/log/nginx/access.log

2
examples/kubernetes-ingress/ingress.yml
View File

@ -5,7 +5,7 @@ metadata:
annotations: annotations:
bunkerweb.io/AUTOCONF: "yes" bunkerweb.io/AUTOCONF: "yes"
bunkerweb.io/AUTO_LETS_ENCRYPT: "yes" bunkerweb.io/AUTO_LETS_ENCRYPT: "yes"
bunkerweb.io/USE_LETS_ENCRYPT_STAGING: "yes"
spec: spec:
rules: rules:
- host: app1.example.com - host: app1.example.com