Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
Arch Linux
infrastructure
Commits
033e02cd
Commit
033e02cd
authored
Feb 18, 2021
by
Jelle van der Waa
🚧
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'bbs_php8' into 'master'
Bbs php8 See merge request
!306
parents
dde2bb8a
d016500d
Pipeline
#5279
passed with stage
in 52 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
8 deletions
+18
-8
roles/fluxbb/defaults/main.yml
roles/fluxbb/defaults/main.yml
+1
-1
roles/fluxbb/tasks/main.yml
roles/fluxbb/tasks/main.yml
+2
-2
roles/fluxbb/templates/config.php.j2
roles/fluxbb/templates/config.php.j2
+5
-5
roles/fluxbb/templates/nginx.conf.j2
roles/fluxbb/templates/nginx.conf.j2
+10
-0
No files found.
roles/fluxbb/defaults/main.yml
View file @
033e02cd
...
...
@@ -4,4 +4,4 @@ fluxbb_dir: /srv/http/fluxbb
fluxbb_cookie_name
:
flux_cookie_eezohm0o
fluxbb_funnyquestion_hash
:
aixuGahCh4eng3bu
fluxbb_version
:
3e9fba035f2273c70ed2d4a
60
9
cc
9ecbdc820116
fluxbb_version
:
8d95fbd95b82dd0a996
60
3
cc
28f79b36b8e54253
roles/fluxbb/tasks/main.yml
View file @
033e02cd
...
...
@@ -6,12 +6,12 @@
-
name
:
clone fluxbb
git
:
repo
:
https://git.archlinux.org/
vhosts/bbs.
archlinux
.org
.git
/
repo
:
https://git
lab
.archlinux.org/archlinux
/archbbs
.git
dest
:
"
{{
fluxbb_dir
}}"
version
:
"
{{
fluxbb_version
}}"
-
name
:
fix home permissions
file
:
state=directory owner=fluxbb group=fluxbb mode=075
0 recurse=yes
path="{{ fluxbb_dir }}"
file
:
state=directory owner=fluxbb group=fluxbb mode=075
5
path="{{ fluxbb_dir }}"
changed_when
:
false
-
name
:
create uploads directory
...
...
roles/fluxbb/templates/config.php.j2
View file @
033e02cd
<?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
View file @
033e02cd
...
...
@@ -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;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment