Browse Source

update pennyworth, move git

master
Yorick van Pelt 2 years ago
parent
commit
5a5a234fd9
Signed by: yorick <yorick@yorickvanpelt.nl> GPG Key ID: D8D3CC6D951384DE
4 changed files with 50 additions and 4 deletions
  1. +1
    -1
      conf
  2. +37
    -1
      logical/pennyworth.nix
  3. +11
    -1
      packages/default.nix
  4. +1
    -1
      servers.json

+ 1
- 1
conf View File

@@ -12,7 +12,7 @@ function get_channel {
echo "nixpkgs=https://github.com/NixOS/nixpkgs/archive/master.tar.gz"
;;
stable)
echo "nixpkgs=https://nixos.org/channels/nixos-17.03/nixexprs.tar.xz"
echo "nixpkgs=https://nixos.org/channels/nixos-18.03/nixexprs.tar.xz"
;;
checkout)
echo "nixpkgs=$PWD/../nixpkgs"


+ 37
- 1
logical/pennyworth.nix View File

@@ -27,7 +27,7 @@
};
};
xmpp = {
enable = true;
enable = false;
vhost = "yori.cc";
admins = [ "yorick@yori.cc" ];
};
@@ -51,5 +51,41 @@
private_key = "/root/keys/http.muflax.key";
};
};
users.extraUsers.git = {
createHome = true;
home = config.services.gitea.stateDir; extraGroups = [ "git" ]; useDefaultShell = true;};
services.gitea = {
enable = true;
user = "git";
database.user = "root";
database.name = "gogs";
#dump.enable = true; TODO: backups
domain = "git.yori.cc";
rootUrl = "https://git.yori.cc/";
httpAddress = "localhost";
cookieSecure = true;
extraConfig = ''
[service]
REGISTER_EMAIL_CONFIRM = false
ENABLE_NOTIFY_MAIL = false
DISABLE_REGISTRATION = true
REQUIRE_SIGNIN_VIEW = false
[picture]
DISABLE_GRAVATAR = false
[mailer]
ENABLED = false
AVATAR_UPLOAD_PATH = ${config.services.gitea.stateDir}/data/avatars
'';
};
services.nginx.virtualHosts."git.yori.cc" = {
forceSSL = true;
enableACME = true;
locations."/" = {
proxyPass = "http://127.0.0.1:${toString config.services.gitea.httpPort}";
extraConfig = ''
proxy_buffering off;
'';
};
};
deployment.keyys = [ <yori-nix/keys/http.muflax.key> ];
}

+ 11
- 1
packages/default.nix View File

@@ -3,5 +3,15 @@
shallot = super.callPackage ./shallot.nix {};
yori-cc = super.callPackage ./yori-cc.nix {};
firmware_qca6174 = super.callPackage ./firmware_qca6174.nix {};

gitea =
super.gitea.overrideDerivation (o: rec {
version = "1.4.1";
name = "gitea-${version}";
src = self.fetchFromGitHub {
owner = "go-gitea";
repo = "gitea";
rev = "v${version}";
sha256 = "1mid67c4021m7mi4ablx1w5v43831gzn8xpg8n30a4zmr70781wm";
};
});
})]

+ 1
- 1
servers.json View File

@@ -1,6 +1,6 @@
{
"pennyworth": {
"pkgs": "channel",
"pkgs": "stable",
"host": "pennyworth.yori.cc"
},
"jarvis": {


Loading…
Cancel
Save