reciproka/reciproka-ops
1
0
Fork 0
Code Issues 6 Pull requests Packages Projects Releases Wiki Activity

reciproka: rename project to Reciproka Ops

Browse source 
resolves #18
This commit is contained in:
Fiscal Velvet Poet 2023-05-09 23:54:45 +10:00
parent b5fc3737da
commit 8aa2357df5
Signed by: fiscalvelvetpoet
GPG key ID: D8EBFD58B023BD47
18 changed files with 75 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LICENSE
View file

@ -1,7 +1,7 @@
ANARCHIST LICENSE
Version 1.0, 1 May, 2021
Copyright © 2021 JFDI Collective
Copyright © 2021 Reciproka Kolectiva
This is Anarchist software, released for free use by individuals and
organizations that do not operate by capitalist principles.

10
README.rst
View file

@ -1,10 +1,10 @@
JFDIC Ops
=========
Reciproka Ops
=============
Colmena_ deployment configuration for `JFDI Collective`_ services.
Colmena_ deployment configuration for services hosted by `Reciproka Kolectiva`_ services.
The canonical home for this repo is
https://source.jfdic.org/jfdic/jfdic-ops
https://reciproka.dev/reciproka/reciproka-ops
.. _Colmena: https://colmena.cli.rs/
.. _JFDI Collective: https://jfdic.org/
.. _Reciproka Kolectiva: https://reciproka.co/

48
flake.lock
View file

@ -107,29 +107,12 @@
"rev": "c0df6f6abed90c66e2eff2106ce89bac0a3344db",
"revCount": 3,
"type": "git",
"url": "https://source.jfdic.org/jfdic/hakyll-skeleton/"
"url": "https://reciproka.dev/reciproka/hakyll-skeleton/"
},
"original": {
"ref": "consensus",
"type": "git",
"url": "https://source.jfdic.org/jfdic/hakyll-skeleton/"
}
},
"jfdic-web": {
"flake": false,
"locked": {
"lastModified": 1656489989,
"narHash": "sha256-cLsW+iddrxLyfUTV/uZTiXgmL8ZQ3cKG4NfKThc2tds=",
"ref": "consensus",
"rev": "6765cb4251eef6d660b761f7f40f99dbf51a739f",
"revCount": 31,
"type": "git",
"url": "https://source.jfdic.org/JFDIC/jfdic-web/"
},
"original": {
"ref": "consensus",
"type": "git",
"url": "https://source.jfdic.org/JFDIC/jfdic-web/"
"url": "https://reciproka.dev/reciproka/hakyll-skeleton/"
}
},
"lowdown-src": {
@ -272,6 +255,23 @@
"type": "github"
}
},
"reciproka-web": {
"flake": false,
"locked": {
"lastModified": 1679661480,
"narHash": "sha256-tcAoUvEdR8aARR3cnmBudDGVfnkBhu7xahWW/9lWOr4=",
"ref": "consensus",
"rev": "89e67b85f6555839039f4e58bb197e9a4cc0a5e5",
"revCount": 33,
"type": "git",
"url": "https://reciproka.dev/reciproka/reciproka-web/"
},
"original": {
"ref": "consensus",
"type": "git",
"url": "https://reciproka.dev/reciproka/reciproka-web/"
}
},
"resrok-web": {
"flake": false,
"locked": {
@ -281,23 +281,23 @@
"rev": "e77bea1a3cc4da6f54c62ba21ca926392e842a21",
"revCount": 5,
"type": "git",
"url": "https://source.jfdic.org/resrok/resrok-web/"
"url": "https://reciproka.dev/resrok/resrok-web/"
},
"original": {
"ref": "consensus",
"type": "git",
"url": "https://source.jfdic.org/resrok/resrok-web/"
"url": "https://reciproka.dev/resrok/resrok-web/"
}
},
"root": {
"inputs": {
"colmena": "colmena",
"hakyll-skeleton": "hakyll-skeleton",
"jfdic-web": "jfdic-web",
"nix": "nix",
"nixpkgs": "nixpkgs_3",
"nixpkgsUnstable": "nixpkgsUnstable",
"ragenix": "ragenix",
"reciproka-web": "reciproka-web",
"resrok-web": "resrok-web",
"utils": "utils_2",
"voc-web": "voc-web"
@ -383,12 +383,12 @@
"rev": "85eb99b5a0a010d8819ea6850c5a359d9ec397b9",
"revCount": 8,
"type": "git",
"url": "https://source.jfdic.org/voc/voc-web/"
"url": "https://reciproka.dev/voc/voc-web/"
},
"original": {
"ref": "consensus",
"type": "git",
"url": "https://source.jfdic.org/voc/voc-web/"
"url": "https://reciproka.dev/voc/voc-web/"
}
}
},

12
flake.nix
View file

@ -1,5 +1,5 @@
{
description = "jfdic-ops deployment";
description = "reciproka-ops deployment";
inputs = {
ragenix = {
@ -8,15 +8,15 @@
};
hakyll-skeleton = {
flake = false;
url = git+https://source.jfdic.org/jfdic/hakyll-skeleton/?ref=consensus;
url = git+https://reciproka.dev/reciproka/hakyll-skeleton/?ref=consensus;
};
jfdic-web = {
reciproka-web = {
flake = false;
url = git+https://source.jfdic.org/JFDIC/jfdic-web/?ref=consensus;
url = git+https://reciproka.dev/reciproka/reciproka-web/?ref=consensus;
};
resrok-web = {
flake = false;
url = git+https://source.jfdic.org/resrok/resrok-web/?ref=consensus;
url = git+https://reciproka.dev/resrok/resrok-web/?ref=consensus;
};
nix.url = "github:NixOS/nix/?ref=2.10.3";
nixpkgs.url = github:NixOS/nixpkgs/?ref=nixos-22.11;
@ -24,7 +24,7 @@
utils.url = "github:numtide/flake-utils";
voc-web = {
flake = false;
url = git+https://source.jfdic.org/voc/voc-web/?ref=consensus;
url = git+https://reciproka.dev/voc/voc-web/?ref=consensus;
};
colmena.url = "github:zhaofengli/colmena/?ref=v0.3.2";
};

2
hardware/linode_vm.nix
View file

@ -1,4 +1,4 @@
# Configuration common to all JFDIC Linode VMs
# Configuration common to all Reciproka Kolectiva Linode VMs
{
config,
pkgs,

4
networks/linode-common.nix
View file

@ -1,4 +1,4 @@
# NixOps configuration common to Linode VMs
# NixOS configuration common to Linode VMs
{
config,
pkgs,
@ -26,7 +26,7 @@
# Configure firewall defaults:
networking = {
usePredictableInterfaceNames = false; # As per Linode's networking guidlines
domain = "jfdic.org";
domain = "reciproka.co";
interfaces.eth0.useDHCP = true;
firewall = {
enable = true;

2
nixos/hosts/toscano/configuration.nix
View file

@ -10,7 +10,7 @@
imports = [
../../../networks/linode.nix
../../../profiles/hakyll-skeleton.nix
../../../profiles/jfdic-web.nix
../../../profiles/reciproka-web.nix
../../../profiles/reciproka-forgejo.nix
../../../profiles/resrok-web.nix
../../../profiles/tmateServer.nix

6
outputs.nix
View file

@ -1,7 +1,7 @@
{
self,
hakyll-skeleton,
jfdic-web,
reciproka-web,
ragenix,
colmena,
nix,
@ -27,8 +27,8 @@ in {
// {
colmena = {
meta = {
description = "jfdi collective's NixOS deployment";
name = "jfdic-ops";
description = "NixOS deployment for Reciproka Kolectiva";
name = "reciproka-ops";
nixpkgs = import nixpkgs {
system = "x86_64-linux";
overlays = [];

2
profiles/bash.nix
View file

@ -1,4 +1,4 @@
# Configuration common to all JFDIC servers
# Configuration common to all Reciproka Kolectiva servers
{config, ...}: {
# Program defaults for all hosts
programs.bash = {

4
profiles/hakyll-skeleton.nix
View file

@ -1,4 +1,4 @@
# NixOps configuration for deploying the JFDIC website
# NixOS configuration for deploying the Reciproka Kolectiva website
{
self,
config,
@ -7,7 +7,7 @@
}: let
flake = builtins.getFlake (toString ../.);
hakyll-skeleton = import flake.inputs.hakyll-skeleton {};
webdomain = "skeleton.jfdic.org";
webdomain = "skeleton.reciproka.co";
in {
environment.sessionVariables = {
LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";

4
profiles/host_common.nix
View file

@ -1,4 +1,4 @@
# Configuration common to all JFDIC servers
# Configuration common to all Reciproka Kolectiva servers
{
config,
pkgs,
@ -108,6 +108,6 @@
];
};
# Users common across JFDIC Ops:
# Users common across Reciproka Ops:
users.mutableUsers = false; # Remove any users not defined in here
}

28
profiles/neovim.nix
View file

@ -157,7 +157,7 @@
set undodir=/tmp/.vim-undo-dir
set undofile
" JFDIC Markdown environment
" Reciproka Kolectiva Markdown environment
function! MarkdownSettings()
set textwidth=79
set spell spelllang=en_au
@ -165,7 +165,7 @@
autocmd BufNewFile,BufFilePre,BufRead *.mdwn :call MarkdownSettings()
autocmd BufNewFile,BufFilePre,BufRead *.md :call MarkdownSettings()
" JFDIC ReStructured Text environment
" Reciproka Kolectiva ReStructured Text environment
function! ReStructuredSettings()
set textwidth=79
set spell spelllang=en_au
@ -176,14 +176,14 @@
autocmd BufNewFile,BufFilePre,BufRead *.rst :call ReStructuredSettings()
autocmd BufNewFile,BufFilePre,BufRead *.txt :call ReStructuredSettings()
" JFDIC LaTeX environment:
" Reciproka Kolectiva LaTeX environment:
function! LaTeXSettings()
set textwidth=79
set spell spelllang=en_au
endfunction
autocmd BufNewFile,BufFilePre,BufRead *.tex :call LaTeXSettings()
" Settings for JFDIC Haskell environment:
" Settings for Reciproka Kolectiva Haskell environment:
function! HaskellSettings()
set tabstop=2
set shiftwidth=2
@ -192,7 +192,7 @@
endfunction
autocmd BufNewFile,BufFilePre,BufRead *.hs :call HaskellSettings()
" Settings for JFDIC Nix environment:
" Settings for Reciproka Kolectiva Nix environment:
function! NixSettings()
set tabstop=2
set shiftwidth=2
@ -202,7 +202,7 @@
endfunction
autocmd BufNewFile,BufFilePre,BufRead *.nix :call NixSettings()
" Settings for JFDIC Cue environment:
" Settings for Reciproka Kolectiva Cue environment:
function! CueSettings()
set noexpandtab
set tabstop=2
@ -212,7 +212,7 @@
endfunction
autocmd BufNewFile,BufFilePre,BufRead *.cue :call CueSettings()
" Settings for JFDIC Rust environment:
" Settings for Reciproka Kolectiva Rust environment:
function! RustSettings()
set tabstop=4
set shiftwidth=4
@ -222,7 +222,7 @@
endfunction
autocmd BufNewFile,BufFilePre,BufRead *.rs :call RustSettings()
" Settings for JFDIC Crystal environment:
" Settings for Reciproka Kolectiva Crystal environment:
function! CrystalSettings()
set tabstop=2
set shiftwidth=2
@ -232,7 +232,7 @@
endfunction
autocmd BufNewFile,BufFilePre,BufRead *.cr :call CrystalSettings()
" Settings for JFDIC Golang environment:
" Settings for Reciproka Kolectiva Golang environment:
function! GoSettings()
set tabstop=7
set shiftwidth=7
@ -240,7 +240,7 @@
endfunction
autocmd BufNewFile,BufFilePre,BufRead *.go :call GoSettings()
" Settings for JFDIC Python environment:
" Settings for Reciproka Kolectiva Python environment:
function! PythonSettings()
set tabstop=4
set shiftwidth=4
@ -250,7 +250,7 @@
endfunction
autocmd BufNewFile,BufFilePre,BufRead *.py :call PythonSettings()
" JFDIC Mutt environment
" Reciproka Kolectiva Mutt environment
function! MuttSettings()
set textwidth=79
set spell spelllang=en_au
@ -261,7 +261,7 @@
autocmd BufNewFile,BufFilePre,BufRead mutt-* :call MuttSettings()
autocmd BufNewFile,BufFilePre,BufRead neomutt-* :call MuttSettings()
" Settings for JFDIC C environment:
" Settings for Reciproka Kolectiva C environment:
function! CSettings()
set tabstop=2
set shiftwidth=2
@ -270,7 +270,7 @@
endfunction
autocmd BufNewFile,BufFilePre,BufRead *.c :call CSettings()
" Settings for JFDIC YAML environment:
" Settings for Reciproka Kolectiva YAML environment:
function! YAMLSettings()
set tabstop=2
set shiftwidth=2
@ -284,7 +284,7 @@
autocmd BufNewFile,BufFilePre,BufRead *.yaml :call YAMLSettings()
autocmd BufNewFile,BufFilePre,BufRead *.yml :call YAMLSettings()
" Settings for JFDIC Bash environment:
" Settings for Reciproka Kolectiva Bash environment:
function! BashSettings()
set tabstop=4
set shiftwidth=4

8
profiles/jfdic-web.nix → profiles/reciproka-web.nix
View file

@ -1,4 +1,4 @@
# NixOps configuration for deploying the JFDIC website
# NixOps configuration for deploying the Reciproka Kolectiva website
{
self,
config,
@ -6,8 +6,8 @@
...
}: let
flake = builtins.getFlake (toString ../.);
jfdic-web = import flake.inputs.jfdic-web {};
webdomain = "jfdic.org";
reciproka-web = import flake.inputs.reciproka-web {};
webdomain = "reciproka.co";
in {
environment.sessionVariables = {
LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
@ -24,7 +24,7 @@ in {
# website hostname
enableACME = true; # Use ACME certs
forceSSL = true; # Force SSL
root = "${jfdic-web}"; # Wesbite root
root = "${reciproka-web}"; # Wesbite root
};
"www.${webdomain}" = {
# Respect our elders :-)

2
profiles/resrok-web.nix
View file

@ -1,4 +1,4 @@
# NixOps configuration for deploying the JFDIC website
# NixOS configuration for deploying the Resilient Rockhampton website
{
self,
config,

2
profiles/server_common.nix
View file

@ -1,4 +1,4 @@
# Configuration common to all JFDIC servers
# Configuration common to all Reciproka Kolectiva servers
{
config,
pkgs,

2
profiles/tmateServer.nix
View file

@ -3,6 +3,6 @@
services.tmate = {
enable = true;
openFirewall = true;
sshHostname = "tmate.jfdic.org";
sshHostname = "tmate.reciproka.co";
};
}

10
profiles/users.nix
View file

@ -1,4 +1,4 @@
# Configuration common to all JFDIC servers
# User configuration common to all Reciproka Kolectiva servers
{
config,
pkgs,
@ -9,10 +9,10 @@
fiscalvelvetpoet.file = ../secrets/fiscalvelvetpoet.age;
};
# JFDIC Ops groups:
# Reciproka Ops groups:
users.groups.fiscalvelvetpoet.gid = 1000;
# JFDIC Ops Users
# Reciproka Ops Users
users.users.fiscalvelvetpoet = {
isNormalUser = true;
uid = 1000;
@ -21,7 +21,7 @@
# fix this
passwordFile = config.age.secrets.fiscalvelvetpoet.path;
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJDMAhG6+40YiYy9wqruHK9M2fLwYAqikJSJ/pRjR/so fiscalvelvetpoet@jfdic.org"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJDMAhG6+40YiYy9wqruHK9M2fLwYAqikJSJ/pRjR/so fiscalvelvetpoet@reciproka"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID7qAXTCAnqq+3ks4L8/2f4J8RxmrFaMOCA7m9ImbW2m fiscalvelvetpoet@sealgair"
];
};
@ -30,7 +30,7 @@
# fix this
passwordFile = config.age.secrets.root.path;
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJDMAhG6+40YiYy9wqruHK9M2fLwYAqikJSJ/pRjR/so fiscalvelvetpoet@jfdic.org"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJDMAhG6+40YiYy9wqruHK9M2fLwYAqikJSJ/pRjR/so fiscalvelvetpoet@reciproka"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID7qAXTCAnqq+3ks4L8/2f4J8RxmrFaMOCA7m9ImbW2m fiscalvelvetpoet@sealgair"
];
};

2
profiles/zsh.nix
View file

@ -1,4 +1,4 @@
# Configuration common to all JFDIC servers
# Configuration common to all Reciproka Kolectiva servers
{
config,
pkgs,