Merge pull request #94907 from zowoq/ecc-nixos
nixos/*: editorconfig fixes
This commit is contained in:
commit
08ba31a660
10 changed files with 17 additions and 18 deletions
|
@ -25,4 +25,4 @@ in
|
|||
services.udev.packages = [ pkgs.libbladeRF ];
|
||||
users.groups.bladerf = {};
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
@ -63,7 +63,7 @@ Activate the system: look for a directory in nix/store similar to:
|
|||
Having found it, activate that nixos system *twice*:
|
||||
chroot . /nix/store/SOMETHING-nixos-SOMETHING/activate
|
||||
chroot . /nix/store/SOMETHING-nixos-SOMETHING/activate
|
||||
|
||||
|
||||
This runs a 'hostname' command. Restore your old hostname with:
|
||||
hostname OLDHOSTNAME
|
||||
|
||||
|
|
|
@ -80,4 +80,4 @@ in {
|
|||
];
|
||||
})
|
||||
];
|
||||
}
|
||||
}
|
||||
|
|
|
@ -53,4 +53,4 @@ with lib;
|
|||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
@ -28,11 +28,11 @@ stop()
|
|||
if test "\$1" = start
|
||||
then
|
||||
trap stop 15
|
||||
|
||||
|
||||
start
|
||||
elif test "\$1" = stop
|
||||
then
|
||||
stop
|
||||
stop
|
||||
elif test "\$1" = init
|
||||
then
|
||||
echo "Are you sure you want to create a new server instance (old server instance will be lost!)?"
|
||||
|
@ -42,21 +42,21 @@ then
|
|||
then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
rm -rf $serverDir
|
||||
mkdir -p $serverDir
|
||||
cd $serverDir
|
||||
cp -av $jboss/server/default .
|
||||
sed -i -e "s|deploy/|$deployDir|" default/conf/jboss-service.xml
|
||||
|
||||
|
||||
if ! test "$useJK" = ""
|
||||
then
|
||||
sed -i -e 's|<attribute name="UseJK">false</attribute>|<attribute name="UseJK">true</attribute>|' default/deploy/jboss-web.deployer/META-INF/jboss-service.xml
|
||||
sed -i -e 's|<Engine name="jboss.web" defaultHost="localhost">|<Engine name="jboss.web" defaultHost="localhost" jvmRoute="node1">|' default/deploy/jboss-web.deployer/server.xml
|
||||
fi
|
||||
|
||||
|
||||
# Make files accessible for the server user
|
||||
|
||||
|
||||
chown -R $user $serverDir
|
||||
for i in \`find $serverDir -type d\`
|
||||
do
|
||||
|
|
|
@ -34,4 +34,4 @@ with lib;
|
|||
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -63,7 +63,7 @@ addEntry() {
|
|||
copyToKernelsDir $kernel; kernel=$result
|
||||
copyToKernelsDir $initrd; initrd=$result
|
||||
fi
|
||||
|
||||
|
||||
mkdir -p $outdir
|
||||
ln -sf $(readlink -f $path) $outdir/system
|
||||
ln -sf $(readlink -f $path/init) $outdir/init
|
||||
|
|
|
@ -53,7 +53,7 @@ addEntry() {
|
|||
echo "exec $stage2"
|
||||
)"
|
||||
|
||||
[ "$path" != "$defaultConfig" ] || {
|
||||
[ "$path" != "$defaultConfig" ] || {
|
||||
echo "$content" > $tmp
|
||||
echo "# older configurations: $targetOther" >> $tmp
|
||||
chmod +x $tmp
|
||||
|
|
|
@ -36,4 +36,4 @@ with lib;
|
|||
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -23,7 +23,7 @@ for ((i = 0; i < ${#targets_[@]}; i++)); do
|
|||
done
|
||||
|
||||
else
|
||||
|
||||
|
||||
mkdir -p $out/etc/$(dirname $target)
|
||||
if ! [ -e $out/etc/$target ]; then
|
||||
ln -s $source $out/etc/$target
|
||||
|
@ -34,13 +34,12 @@ for ((i = 0; i < ${#targets_[@]}; i++)); do
|
|||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
if test "${modes_[$i]}" != symlink; then
|
||||
echo "${modes_[$i]}" > $out/etc/$target.mode
|
||||
echo "${users_[$i]}" > $out/etc/$target.uid
|
||||
echo "${groups_[$i]}" > $out/etc/$target.gid
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
done
|
||||
|
||||
|
|
Loading…
Reference in a new issue