Commit 033e02cd authored by Jelle van der Waa's avatar Jelle van der Waa 🚧
Browse files

Merge branch 'bbs_php8' into 'master'

Bbs php8

See merge request !306
parents dde2bb8a d016500d
Pipeline #5279 passed with stage
in 52 seconds
...@@ -4,4 +4,4 @@ fluxbb_dir: /srv/http/fluxbb ...@@ -4,4 +4,4 @@ fluxbb_dir: /srv/http/fluxbb
fluxbb_cookie_name: flux_cookie_eezohm0o fluxbb_cookie_name: flux_cookie_eezohm0o
fluxbb_funnyquestion_hash: aixuGahCh4eng3bu fluxbb_funnyquestion_hash: aixuGahCh4eng3bu
fluxbb_version: 3e9fba035f2273c70ed2d4a609cc9ecbdc820116 fluxbb_version: 8d95fbd95b82dd0a996603cc28f79b36b8e54253
...@@ -6,12 +6,12 @@ ...@@ -6,12 +6,12 @@
- name: clone fluxbb - name: clone fluxbb
git: git:
repo: https://git.archlinux.org/vhosts/bbs.archlinux.org.git/ repo: https://gitlab.archlinux.org/archlinux/archbbs.git
dest: "{{ fluxbb_dir }}" dest: "{{ fluxbb_dir }}"
version: "{{ fluxbb_version }}" version: "{{ fluxbb_version }}"
- name: fix home permissions - name: fix home permissions
file: state=directory owner=fluxbb group=fluxbb mode=0750 recurse=yes path="{{ fluxbb_dir }}" file: state=directory owner=fluxbb group=fluxbb mode=0755 path="{{ fluxbb_dir }}"
changed_when: false changed_when: false
- name: create uploads directory - name: create uploads directory
......
<?php <?php
$db_type = 'mysqli'; $db_type = 'mysqli_innodb';
$db_host = 'localhost'; $db_host = 'localhost';
$db_name = 'fluxbb'; $db_name = 'fluxbb';
$db_username = 'fluxbb'; $db_username = 'fluxbb';
...@@ -14,15 +14,15 @@ $cookie_path = '/'; ...@@ -14,15 +14,15 @@ $cookie_path = '/';
$cookie_secure = 0; $cookie_secure = 0;
$cookie_seed = '{{ fluxbb_cookie_seed }}'; $cookie_seed = '{{ fluxbb_cookie_seed }}';
$arch_home ='http://www.archlinux.org/'; $arch_home ='http://archlinux.org/';
$arch_navbar = array('Home' => 'http://www.archlinux.org/', $arch_navbar = array('Home' => 'http://archlinux.org/',
'Packages' => 'http://www.archlinux.org/packages/', 'Packages' => 'http://archlinux.org/packages/',
'Forums' => 'https://bbs.archlinux.org/', 'Forums' => 'https://bbs.archlinux.org/',
'Wiki' => 'https://wiki.archlinux.org/', 'Wiki' => 'https://wiki.archlinux.org/',
'Bugs' => 'https://bugs.archlinux.org/', 'Bugs' => 'https://bugs.archlinux.org/',
'Security' => 'https://security.archlinux.org/', 'Security' => 'https://security.archlinux.org/',
'AUR' => 'https://aur.archlinux.org/', 'AUR' => 'https://aur.archlinux.org/',
'Download' => 'http://www.archlinux.org/download/'); 'Download' => 'http://archlinux.org/download/');
$arch_navbar_selected = 'Forums'; $arch_navbar_selected = 'Forums';
$funnyquestion_hash = '{{ fluxbb_funnyquestion_hash }}'; $funnyquestion_hash = '{{ fluxbb_funnyquestion_hash }}';
......
...@@ -17,6 +17,7 @@ server { ...@@ -17,6 +17,7 @@ server {
# limit to 1 requests per minute, with a burst defined when we use this # limit to 1 requests per minute, with a burst defined when we use this
# limiter in the location directive below # limiter in the location directive below
limit_req_zone $binary_remote_addr zone=rsslimit:8m rate=1r/m; limit_req_zone $binary_remote_addr zone=rsslimit:8m rate=1r/m;
limit_req_zone $binary_remote_addr zone=searchlimit:10m rate=1r/s;
limit_req_status 429; limit_req_status 429;
server { server {
...@@ -37,6 +38,15 @@ server { ...@@ -37,6 +38,15 @@ server {
deny all; deny all;
} }
location = /search.php {
limit_req zone=searchlimit burst=10;
fastcgi_pass unix:/run/php-fpm/fluxbb.socket;
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param HTTPS on;
include fastcgi_params;
}
location ~ /extern\.php { location ~ /extern\.php {
limit_req zone=rsslimit burst=10 nodelay; limit_req zone=rsslimit burst=10 nodelay;
fastcgi_pass unix:/run/php-fpm/fluxbb.socket; fastcgi_pass unix:/run/php-fpm/fluxbb.socket;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment