mirror of
https://github.com/Expand-sys/pihole-dnsovertls
synced 2025-12-16 23:42:13 +11:00
patch fro debian 12
This commit is contained in:
parent
9c83ec1bb8
commit
122ac55e1f
1 changed files with 78 additions and 2 deletions
|
|
@ -9,24 +9,46 @@
|
||||||
with_first_found:
|
with_first_found:
|
||||||
- "vars/default.yml"
|
- "vars/default.yml"
|
||||||
tasks:
|
tasks:
|
||||||
- name: install python3 for certbot
|
- name: install required dependencies
|
||||||
ansible.builtin.apt:
|
ansible.builtin.apt:
|
||||||
pkg:
|
pkg:
|
||||||
- python3
|
- python3
|
||||||
- python3-pip
|
- python3-pip
|
||||||
- libaugeas0
|
- libaugeas0
|
||||||
- nginx
|
- nginx
|
||||||
|
- libnginx-mod-stream
|
||||||
|
state: present
|
||||||
|
|
||||||
|
|
||||||
|
- name: install dependencies Debian 12
|
||||||
|
ansible.builtin.apt:
|
||||||
|
pkg:
|
||||||
|
- php-fpm
|
||||||
|
- php-cgi
|
||||||
|
- php-xml
|
||||||
|
- php-sqlite3
|
||||||
|
- php-intl
|
||||||
|
- python3-virtualenv
|
||||||
|
state: present
|
||||||
|
when: ansible_distribution_major_version == "12"
|
||||||
|
|
||||||
|
- name: Install dependencies Debian 11 and below
|
||||||
|
ansible.builtin.apt:
|
||||||
|
pkg:
|
||||||
- php7.4-fpm
|
- php7.4-fpm
|
||||||
- php7.4-cgi
|
- php7.4-cgi
|
||||||
- php7.4-xml
|
- php7.4-xml
|
||||||
- php7.4-sqlite3
|
- php7.4-sqlite3
|
||||||
- php7.4-intl
|
- php7.4-intl
|
||||||
state: present
|
state: present
|
||||||
|
when: ansible_distribution_major_version < "12"
|
||||||
|
|
||||||
- name: install virtualenv via pip3
|
- name: install virtualenv via pip3
|
||||||
ansible.builtin.pip:
|
ansible.builtin.pip:
|
||||||
name: virtualenv
|
name: virtualenv
|
||||||
state: present
|
state: present
|
||||||
|
when: ansible_distribution_major_version < "12"
|
||||||
|
|
||||||
|
|
||||||
- name: install certbot via pip3
|
- name: install certbot via pip3
|
||||||
ansible.builtin.pip:
|
ansible.builtin.pip:
|
||||||
|
|
@ -116,6 +138,51 @@
|
||||||
}
|
}
|
||||||
path: /etc/nginx/sites-enabled/dnsovertls.conf
|
path: /etc/nginx/sites-enabled/dnsovertls.conf
|
||||||
create: true
|
create: true
|
||||||
|
|
||||||
|
- name: create new config for pihol configuration debian 12
|
||||||
|
ansible.builtin.blockinfile:
|
||||||
|
content: |
|
||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
listen 443 ssl;
|
||||||
|
listen [::]:80;
|
||||||
|
listen [::]:443 ssl;
|
||||||
|
ssl_certificate /etc/letsencrypt/live/{{ DNSDOMAIN }}/fullchain.pem; # managed by Certbot
|
||||||
|
ssl_certificate_key /etc/letsencrypt/live/{{ DNSDOMAIN }}/privkey.pem; # managed by Certbot
|
||||||
|
root /var/www/html;
|
||||||
|
server_name {{ DNSDOMAIN }};
|
||||||
|
autoindex off;
|
||||||
|
|
||||||
|
index pihole/index.php index.php index.html index.htm;
|
||||||
|
|
||||||
|
location / {
|
||||||
|
expires max;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~ \.php$ {
|
||||||
|
include fastcgi_params;
|
||||||
|
fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name;
|
||||||
|
fastcgi_pass unix:/run/php/php7.4-fpm.sock;
|
||||||
|
fastcgi_param FQDN true;
|
||||||
|
}
|
||||||
|
|
||||||
|
location /*.js {
|
||||||
|
index pihole/index.js;
|
||||||
|
}
|
||||||
|
|
||||||
|
location /admin {
|
||||||
|
root /var/www/html;
|
||||||
|
index index.php index.html index.htm;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~ /\.ht {
|
||||||
|
deny all;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
path: /etc/nginx/sites-enabled/dnsovertls.conf
|
||||||
|
create: true
|
||||||
|
when: ansible_distribution_major_version == "12"
|
||||||
|
|
||||||
|
|
||||||
- name: configure nginx stream for android privatedns
|
- name: configure nginx stream for android privatedns
|
||||||
ansible.builtin.blockinfile:
|
ansible.builtin.blockinfile:
|
||||||
|
|
@ -146,6 +213,15 @@
|
||||||
name: php7.4-fpm
|
name: php7.4-fpm
|
||||||
state: restarted
|
state: restarted
|
||||||
enabled: true
|
enabled: true
|
||||||
|
when: ansible_distribution_major_version < "12"
|
||||||
|
|
||||||
|
- name: Start nginx
|
||||||
|
ansible.builtin.systemd_service:
|
||||||
|
name: php8.2-fpm
|
||||||
|
state: restarted
|
||||||
|
enabled: true
|
||||||
|
when: ansible_distribution_major_version == "12"
|
||||||
|
|
||||||
- name: Start nginx
|
- name: Start nginx
|
||||||
ansible.builtin.systemd_service:
|
ansible.builtin.systemd_service:
|
||||||
name: nginx
|
name: nginx
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue