betamike/betamike-infra
1
0
Fork 1
Code Issues Pull Requests Actions Projects Releases Wiki Activity

add floating ip for git hosting and upgrade matrix services

Browse Source
This commit is contained in:
Mike Cugini 2021-10-15 22:16:03 -04:00
parent f3ea03b0ad
commit 7ef2ad3c70
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos_configs/git.nix
View File

@ -42,7 +42,7 @@ in
# only send cookies over tls # only send cookies over tls
cookieSecure = true; cookieSecure = true;
disableRegistration = false; disableRegistration = true;
settings.server.LANDING_PAGE = "explore"; settings.server.LANDING_PAGE = "explore";
}; };

18
nixos_configs/matrix.nix
View File

@ -169,22 +169,26 @@ in {
users.users.matrix-registration = { users.users.matrix-registration = {
home = matrix-reg-dir; home = matrix-reg-dir;
createHome = true; createHome = true;
isNormalUser = true;
}; };
systemd.services.matrix-registration = let systemd.services.matrix-registration = let
configFile = pkgs.writeText "matrix-reg-config.yaml" '' configFile = pkgs.writeText "matrix-reg-config.yaml" ''
server_location: 'https://matrix.waffle.farm:443' server_location: 'https://matrix.waffle.farm:443'
base_url: 'waffle.farm' base_url: ""
server_name: 'waffle.farm' server_name: 'waffle.farm'
shared_secret: '${secrets.matrix.registration_secret}' registration_shared_secret: '${secrets.matrix.registration_secret}'
riot_instance: 'chat.waffle.farm' admin_api_shared_secret: '${secrets.matrix.admin_api_secret}'
client_redirect: 'chat.waffle.farm'
client_logo: 'static/images/element-logo.png'
db: 'sqlite:///${matrix-reg-dir}/db.sqlite3' db: 'sqlite:///${matrix-reg-dir}/db.sqlite3'
host: 'localhost' host: 'localhost'
port: 5000 port: 5000
rate_limit: ["100 per day", "10 per minute"] rate_limit: ["1000 per day", "100 per minute"]
allow_cors: false allow_cors: false
ip_logging: false
logging: logging:
disable_existing_loggers: False disable_existing_loggers: false
version: 1 version: 1
root: root:
level: DEBUG level: DEBUG
@ -202,6 +206,9 @@ logging:
stream: ext://sys.stdout stream: ext://sys.stdout
password: password:
min_length: 8 min_length: 8
username:
validation_regex: [] #list of regexes that the selected username must match. Example: '[a-zA-Z]\.[a-zA-Z]'
invalidation_regex: [] #list of regexes that the selected username must NOT match. Example: '(admin|support)'
''; '';
in { in {
enable = true; enable = true;
@ -221,6 +228,7 @@ password:
users.users.slackbridge = { users.users.slackbridge = {
home = slackbridge-dir; home = slackbridge-dir;
createHome = true; createHome = true;
isNormalUser = true;
}; };
systemd.services.matrix-appservice-slack = let systemd.services.matrix-appservice-slack = let

5
terraform/git.tf
View File

@ -15,6 +15,11 @@ resource "digitalocean_droplet" "git-1" {
ssh_keys = [data.digitalocean_ssh_key.mops.id] ssh_keys = [data.digitalocean_ssh_key.mops.id]
} }
resource "digitalocean_floating_ip" "code_betamike_com" {
droplet_id = digitalocean_droplet.git-1.id
region = digitalocean_droplet.git-1.region
}
resource "digitalocean_volume_attachment" "git" { resource "digitalocean_volume_attachment" "git" {
droplet_id = digitalocean_droplet.git-1.id droplet_id = digitalocean_droplet.git-1.id
volume_id = digitalocean_volume.git.id volume_id = digitalocean_volume.git.id