nixos/*: editorconfig fixes
This commit is contained in:
parent
3735c9ef90
commit
8fb410c0ad
|
@ -25,4 +25,4 @@ in
|
||||||
services.udev.packages = [ pkgs.libbladeRF ];
|
services.udev.packages = [ pkgs.libbladeRF ];
|
||||||
users.groups.bladerf = {};
|
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*:
|
Having found it, activate that nixos system *twice*:
|
||||||
chroot . /nix/store/SOMETHING-nixos-SOMETHING/activate
|
chroot . /nix/store/SOMETHING-nixos-SOMETHING/activate
|
||||||
chroot . /nix/store/SOMETHING-nixos-SOMETHING/activate
|
chroot . /nix/store/SOMETHING-nixos-SOMETHING/activate
|
||||||
|
|
||||||
This runs a 'hostname' command. Restore your old hostname with:
|
This runs a 'hostname' command. Restore your old hostname with:
|
||||||
hostname OLDHOSTNAME
|
hostname OLDHOSTNAME
|
||||||
|
|
||||||
|
|
|
@ -80,4 +80,4 @@ in {
|
||||||
];
|
];
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -53,4 +53,4 @@ with lib;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,11 +28,11 @@ stop()
|
||||||
if test "\$1" = start
|
if test "\$1" = start
|
||||||
then
|
then
|
||||||
trap stop 15
|
trap stop 15
|
||||||
|
|
||||||
start
|
start
|
||||||
elif test "\$1" = stop
|
elif test "\$1" = stop
|
||||||
then
|
then
|
||||||
stop
|
stop
|
||||||
elif test "\$1" = init
|
elif test "\$1" = init
|
||||||
then
|
then
|
||||||
echo "Are you sure you want to create a new server instance (old server instance will be lost!)?"
|
echo "Are you sure you want to create a new server instance (old server instance will be lost!)?"
|
||||||
|
@ -42,21 +42,21 @@ then
|
||||||
then
|
then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
rm -rf $serverDir
|
rm -rf $serverDir
|
||||||
mkdir -p $serverDir
|
mkdir -p $serverDir
|
||||||
cd $serverDir
|
cd $serverDir
|
||||||
cp -av $jboss/server/default .
|
cp -av $jboss/server/default .
|
||||||
sed -i -e "s|deploy/|$deployDir|" default/conf/jboss-service.xml
|
sed -i -e "s|deploy/|$deployDir|" default/conf/jboss-service.xml
|
||||||
|
|
||||||
if ! test "$useJK" = ""
|
if ! test "$useJK" = ""
|
||||||
then
|
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|<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
|
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
|
fi
|
||||||
|
|
||||||
# Make files accessible for the server user
|
# Make files accessible for the server user
|
||||||
|
|
||||||
chown -R $user $serverDir
|
chown -R $user $serverDir
|
||||||
for i in \`find $serverDir -type d\`
|
for i in \`find $serverDir -type d\`
|
||||||
do
|
do
|
||||||
|
|
|
@ -34,4 +34,4 @@ with lib;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -63,7 +63,7 @@ addEntry() {
|
||||||
copyToKernelsDir $kernel; kernel=$result
|
copyToKernelsDir $kernel; kernel=$result
|
||||||
copyToKernelsDir $initrd; initrd=$result
|
copyToKernelsDir $initrd; initrd=$result
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mkdir -p $outdir
|
mkdir -p $outdir
|
||||||
ln -sf $(readlink -f $path) $outdir/system
|
ln -sf $(readlink -f $path) $outdir/system
|
||||||
ln -sf $(readlink -f $path/init) $outdir/init
|
ln -sf $(readlink -f $path/init) $outdir/init
|
||||||
|
|
|
@ -53,7 +53,7 @@ addEntry() {
|
||||||
echo "exec $stage2"
|
echo "exec $stage2"
|
||||||
)"
|
)"
|
||||||
|
|
||||||
[ "$path" != "$defaultConfig" ] || {
|
[ "$path" != "$defaultConfig" ] || {
|
||||||
echo "$content" > $tmp
|
echo "$content" > $tmp
|
||||||
echo "# older configurations: $targetOther" >> $tmp
|
echo "# older configurations: $targetOther" >> $tmp
|
||||||
chmod +x $tmp
|
chmod +x $tmp
|
||||||
|
|
|
@ -36,4 +36,4 @@ with lib;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,7 +23,7 @@ for ((i = 0; i < ${#targets_[@]}; i++)); do
|
||||||
done
|
done
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
mkdir -p $out/etc/$(dirname $target)
|
mkdir -p $out/etc/$(dirname $target)
|
||||||
if ! [ -e $out/etc/$target ]; then
|
if ! [ -e $out/etc/$target ]; then
|
||||||
ln -s $source $out/etc/$target
|
ln -s $source $out/etc/$target
|
||||||
|
@ -34,13 +34,12 @@ for ((i = 0; i < ${#targets_[@]}; i++)); do
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "${modes_[$i]}" != symlink; then
|
if test "${modes_[$i]}" != symlink; then
|
||||||
echo "${modes_[$i]}" > $out/etc/$target.mode
|
echo "${modes_[$i]}" > $out/etc/$target.mode
|
||||||
echo "${users_[$i]}" > $out/etc/$target.uid
|
echo "${users_[$i]}" > $out/etc/$target.uid
|
||||||
echo "${groups_[$i]}" > $out/etc/$target.gid
|
echo "${groups_[$i]}" > $out/etc/$target.gid
|
||||||
fi
|
fi
|
||||||
|
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue