cleanup and remove payara config
This commit is contained in:
parent
6cdd4636e0
commit
05b0940e14
6 changed files with 4 additions and 32 deletions
|
|
@ -4,10 +4,7 @@ let
|
|||
in {
|
||||
den.aspects.dev.nixos = { pkgs, ... }:
|
||||
let
|
||||
pkgs-unstable = import inputs.nixpkgs-unstable {
|
||||
system = pkgs.system;
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
pkgs-unstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.stdenv.hostPlatform.system};
|
||||
in {
|
||||
environment.systemPackages = with pkgs-unstable; [
|
||||
# CLI utilities
|
||||
|
|
@ -67,23 +64,6 @@ in {
|
|||
JAVA_HOME = "${pkgs-unstable.openjdk8}";
|
||||
};
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
"d /var/lib/payara41 0755 ${username} users -"
|
||||
];
|
||||
|
||||
system.activationScripts.payaraJava = ''
|
||||
asenv=/var/lib/payara41/glassfish/config/asenv.conf
|
||||
if [ -f "$asenv" ]; then
|
||||
${pkgs.gnused}/bin/sed -i '/^AS_JAVA=/d' "$asenv"
|
||||
echo 'AS_JAVA="${pkgs-unstable.openjdk8}"' >> "$asenv"
|
||||
fi
|
||||
|
||||
domain_xml=/var/lib/payara41/glassfish/domains/domain1/config/domain.xml
|
||||
if [ -f "$domain_xml" ]; then
|
||||
${pkgs.gnused}/bin/sed -i 's|java-home="[^"]*"|java-home="${pkgs-unstable.openjdk8}/lib/openjdk"|' "$domain_xml"
|
||||
fi
|
||||
'';
|
||||
|
||||
virtualisation.docker.enable = true;
|
||||
users.users.${username}.extraGroups = [ "docker" ];
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue