From 208a13e5d410c07b3207caa5649961d9d70301c7 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@vdwaa.nl>
Date: Sun, 27 Oct 2019 18:24:24 +0100
Subject: [PATCH] Move fluxbb to a separate vps
Signed-off-by: Jelle van der Waa <jelle@vdwaa.nl>
---
hosts | 1 +
playbooks/bbs.archlinux.org.yml | 5 ++---
roles/fluxbb/defaults/main.yml | 6 ++++++
roles/fluxbb/tasks/main.yml | 2 +-
roles/fluxbb/templates/config.php.j2 | 2 +-
5 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/hosts b/hosts
index aabc016d9..aae285c23 100644
--- a/hosts
+++ b/hosts
@@ -33,6 +33,7 @@ state.cloud.archlinux.org
matrix.archlinux.org
quassel.archlinux.org
phrik.archlinux.org
+bbs.archlinux.org
[mysql-servers]
apollo.archlinux.org
diff --git a/playbooks/bbs.archlinux.org.yml b/playbooks/bbs.archlinux.org.yml
index 0a60e2bfe..65243eb12 100644
--- a/playbooks/bbs.archlinux.org.yml
+++ b/playbooks/bbs.archlinux.org.yml
@@ -1,8 +1,7 @@
---
- name: setup bbs.archlinux.org
- #hosts: bbs.archlinux.org
- hosts: 116.203.93.142
+ hosts: bbs.archlinux.org
remote_user: root
roles:
- { role: common }
@@ -16,5 +15,5 @@
mariadb_innodb_file_per_table: True }
- { role: sudo }
- { role: uwsgi }
- - { role: php-fpm, php_extensions: ['iconv', 'intl', 'mysqli'], zend_extensions: ['opcache'] }
+ - { role: php-fpm }
- { role: fluxbb }
diff --git a/roles/fluxbb/defaults/main.yml b/roles/fluxbb/defaults/main.yml
index 99030eeaa..e0735956f 100644
--- a/roles/fluxbb/defaults/main.yml
+++ b/roles/fluxbb/defaults/main.yml
@@ -5,3 +5,9 @@ fluxbb_dir: /srv/http/fluxbb
fluxbb_cookie_name: flux_cookie_eezohm0o
fluxbb_cookie_seed: huathe3ooZuwieba
fluxbb_funnyquestion_hash: aixuGahCh4eng3bu
+
+php_extensions:
+ - iconv
+ - intl
+ - mysqli
+ - apcu
diff --git a/roles/fluxbb/tasks/main.yml b/roles/fluxbb/tasks/main.yml
index 23fbeec6d..baa71b898 100644
--- a/roles/fluxbb/tasks/main.yml
+++ b/roles/fluxbb/tasks/main.yml
@@ -20,7 +20,7 @@
- name: create mariadb user
mysql_user: >
- user=fluxbb host=localhost password={{ mariadb_users.fluxbb }}
+ user=fluxbb host=localhost password={{ fluxbb_db_password }}
priv='fluxbb.*:ALL'
- name: create nginx log directory
diff --git a/roles/fluxbb/templates/config.php.j2 b/roles/fluxbb/templates/config.php.j2
index 8a91ff28f..a07369fc4 100644
--- a/roles/fluxbb/templates/config.php.j2
+++ b/roles/fluxbb/templates/config.php.j2
@@ -4,7 +4,7 @@ $db_type = 'mysqli';
$db_host = 'localhost';
$db_name = 'fluxbb';
$db_username = 'fluxbb';
-$db_password = '{{ mariadb_users.fluxbb }}';
+$db_password = '{{ fluxbb_db_password }}';
$db_prefix = 'fluxbb_';
$p_connect = false;
--
GitLab