Merge branch 'bbs_php8' into 'master'

Bbs php8

See merge request !306

roles/fluxbb/defaults/main.yml

@@ -4,4 +4,4 @@ fluxbb_dir: /srv/http/fluxbb
 
 fluxbb_cookie_name: flux_cookie_eezohm0o
 fluxbb_funnyquestion_hash: aixuGahCh4eng3bu
-fluxbb_version: 3e9fba035f2273c70ed2d4a609cc9ecbdc820116
+fluxbb_version: 8d95fbd95b82dd0a996603cc28f79b36b8e54253

roles/fluxbb/tasks/main.yml

@@ -6,12 +6,12 @@
 
 - name: clone fluxbb
   git:
-    repo: https://git.archlinux.org/vhosts/bbs.archlinux.org.git/
+    repo: https://gitlab.archlinux.org/archlinux/archbbs.git
     dest: "{{ fluxbb_dir }}"
     version: "{{ fluxbb_version }}"
 
 - 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
 
 - name: create uploads directory

roles/fluxbb/templates/config.php.j2

 <?php
 
-$db_type = 'mysqli';
+$db_type = 'mysqli_innodb';
 $db_host = 'localhost';
 $db_name = 'fluxbb';
 $db_username = 'fluxbb';
@@ -14,15 +14,15 @@ $cookie_path = '/';
 $cookie_secure = 0;
 $cookie_seed = '{{ fluxbb_cookie_seed }}';
 
-$arch_home ='http://www.archlinux.org/';
-$arch_navbar = array('Home' => 'http://www.archlinux.org/',
-                      'Packages' => 'http://www.archlinux.org/packages/',
+$arch_home ='http://archlinux.org/';
+$arch_navbar = array('Home' => 'http://archlinux.org/',
+                      'Packages' => 'http://archlinux.org/packages/',
                       'Forums' => 'https://bbs.archlinux.org/',
                       'Wiki' => 'https://wiki.archlinux.org/',
                       'Bugs' => 'https://bugs.archlinux.org/',
 		      'Security' => 'https://security.archlinux.org/',
                       'AUR' => 'https://aur.archlinux.org/',
-                      'Download' => 'http://www.archlinux.org/download/');
+                      'Download' => 'http://archlinux.org/download/');
 $arch_navbar_selected = 'Forums';
 
 $funnyquestion_hash = '{{ fluxbb_funnyquestion_hash }}';

roles/fluxbb/templates/nginx.conf.j2

@@ -17,6 +17,7 @@ server {
 # limit to 1 requests per minute, with a burst defined when we use this
 # 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=searchlimit:10m rate=1r/s;
 limit_req_status 429;
 
 server {
@@ -37,6 +38,15 @@ server {
         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 {
         limit_req zone=rsslimit burst=10 nodelay;
         fastcgi_pass   unix:/run/php-fpm/fluxbb.socket;