versia-pub/activitypub
2
0
Fork 0
mirror of https://github.com/versia-pub/activitypub.git synced 2025-12-06 14:48:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: oci image

Browse source
This commit is contained in:
April John 2024-05-09 23:07:20 +02:00
parent 42133b257b
commit 5db0f6a37a
Signed by: aprl
GPG key ID: BCB934A2909C5460
4 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
flake.nix
View file

@ -77,6 +77,25 @@
pkg-config pkg-config
]; ];
}; };
packages.ociImage = pkgs.dockerTools.buildLayeredImage
{
name = "lysand-ap-layer";
contents = [
config.packages.lysand-ap-layer config.packages.ls-ap-migration pkgs.bash
];
config = {
Cmd = [
"${pkgs.bash}/bin/bash"
"${config.packages.ls-ap-migration}/bin/ls-ap-migration"
"up"
"&&"
"${config.packages.lysand-ap-layer}/bin/lysand-ap-layer"
];
ExposedPorts = {
"8080/tcp" = { };
};
};
};
# Rust dev environment # Rust dev environment
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {

10
module.nix
View file

@ -254,11 +254,11 @@ in
script = "${cfg.package}/bin/lysandap"; script = "${cfg.package}/bin/lysandap";
preStart = "${cfg.mig-package}/bin/ls-ap-migration up"; preStart = "${cfg.mig-package}/bin/ls-ap-migration up";
environment = lib.mkDefault { environment = lib.mkDefault {
"PORT" = "${toString cfg.port}"; "PORT" = "${toString cfg.port}";
"ADDRESS" = "${cfg.address}:${toString cfg.port}"; "ADDRESS" = "${cfg.address}:${toString cfg.port}";
"FEDERATED_DOMAIN" = cfg.domain; "FEDERATED_DOMAIN" = cfg.domain;
"SERVICE_SCALE" = toString cfg.serviceScale; "SERVICE_SCALE" = toString cfg.serviceScale;
"LOCAL_USER_NAME" = "example"; "LOCAL_USER_NAME" = "example";
}; };
serviceConfig = { serviceConfig = {
DynamicUser = true; DynamicUser = true;

1
src/main.rs
View file

@ -44,6 +44,7 @@ mod error;
mod http; mod http;
mod objects; mod objects;
mod utils; mod utils;
//mod lysand;
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
struct Response { struct Response {

7
src/objects/person.rs
View file

@ -1,5 +1,8 @@
use crate::{ use crate::{
activities::{create_post::CreatePost, follow::{self, Follow}}, activities::{
create_post::CreatePost,
follow::{self, Follow},
},
database::{State, StateHandle}, database::{State, StateHandle},
entities::{self, user}, entities::{self, user},
error::Error, error::Error,
@ -42,7 +45,7 @@ pub struct DbUser {
pub enum PersonAcceptedActivities { pub enum PersonAcceptedActivities {
CreateNote(CreatePost), CreateNote(CreatePost),
Follow(Follow), Follow(Follow),
Accept(follow::Accept) Accept(follow::Accept),
} }
impl DbUser { impl DbUser {