Skip to content

Commit 19548c9

Browse files
authored
Merge pull request #177 from json-scada/master
Fix errors in dev.nix file.
2 parents ddb9525 + 330680a commit 19548c9

File tree

4 files changed

+46
-10
lines changed

4 files changed

+46
-10
lines changed

.idx/dev.nix

+8-3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
# Use https://search.nixos.org/packages to find packages
88
packages = [
9+
pkgs.sudo
910
pkgs.postgresql_15_jit
1011
pkgs.postgresql15Packages.timescaledb
1112
pkgs.postgresql15Packages.timescaledb_toolkit
@@ -16,6 +17,7 @@
1617
pkgs.icu
1718
pkgs.gcc
1819
pkgs.gnumake
20+
pkgs.cmake
1921
pkgs.go
2022
pkgs.python311
2123
pkgs.python311Packages.pip
@@ -44,7 +46,9 @@
4446
services.docker.enable = true;
4547

4648
# Sets environment variables in the workspace
47-
env = { };
49+
env = {
50+
DOTNET_ROOT = "/nix/store/3frycb58lshfmnkjv1rvqqz1s7wyvvck-dotnet-sdk-8.0.101";
51+
};
4852
idx = {
4953
# Search for the extensions you want on https://open-vsx.org/ and use "publisher.id"
5054
extensions = [
@@ -74,8 +78,9 @@
7478
# Runs when a workspace is first created
7579
onCreate = {
7680
init-mongodb = "
77-
mkdir -p ~/mongodb/var/lib/mongo/ &&
78-
mkdir -p ~/mongodb/var/log/mongodb/ &&
81+
rm -rf ~/.emu/avd
82+
mkdir -p /mnt/ephemeral/mongodb/var/lib/mongo/ &&
83+
mkdir -p /mnt/ephemeral/mongodb/var/log/mongodb/ &&
7984
mongod -f ~/json-scada/platform-nix-idx/mongod.conf &&
8085
mongosh json_scada < ~/json-scada/mongo_seed/a_rs-init.js &&
8186
mongosh json_scada < ~/json-scada/mongo_seed/b_create-db.js &&

platform-nix-idx/dev.nix

+8-3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
# Use https://search.nixos.org/packages to find packages
88
packages = [
9+
pkgs.sudo
910
pkgs.postgresql_15_jit
1011
pkgs.postgresql15Packages.timescaledb
1112
pkgs.postgresql15Packages.timescaledb_toolkit
@@ -16,6 +17,7 @@
1617
pkgs.icu
1718
pkgs.gcc
1819
pkgs.gnumake
20+
pkgs.cmake
1921
pkgs.go
2022
pkgs.python311
2123
pkgs.python311Packages.pip
@@ -44,7 +46,9 @@
4446
services.docker.enable = true;
4547

4648
# Sets environment variables in the workspace
47-
env = { };
49+
env = {
50+
DOTNET_ROOT = "/nix/store/3frycb58lshfmnkjv1rvqqz1s7wyvvck-dotnet-sdk-8.0.101";
51+
};
4852
idx = {
4953
# Search for the extensions you want on https://open-vsx.org/ and use "publisher.id"
5054
extensions = [
@@ -74,8 +78,9 @@
7478
# Runs when a workspace is first created
7579
onCreate = {
7680
init-mongodb = "
77-
mkdir -p ~/mongodb/var/lib/mongo/ &&
78-
mkdir -p ~/mongodb/var/log/mongodb/ &&
81+
rm -rf ~/.emu/avd
82+
mkdir -p /mnt/ephemeral/mongodb/var/lib/mongo/ &&
83+
mkdir -p /mnt/ephemeral/mongodb/var/log/mongodb/ &&
7984
mongod -f ~/json-scada/platform-nix-idx/mongod.conf &&
8085
mongosh json_scada < ~/json-scada/mongo_seed/a_rs-init.js &&
8186
mongosh json_scada < ~/json-scada/mongo_seed/b_create-db.js &&

platform-nix-idx/mongod.conf

+4-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@ net:
44
bindIp: 127.0.0.1
55
port: 27017
66
storage:
7-
dbPath: "/home/user/mongodb/var/lib/mongo"
7+
dbPath: "/mnt/ephemeral/mongodb/var/lib/mongo"
88
systemLog:
99
destination: file
10-
path: "/home/user/mongodb/var/log/mongodb/mongod.log"
11-
logAppend: true
10+
path: "/mnt/ephemeral/mongodb/var/log/mongodb/mongod.log"
11+
# path: "/home/user/mongodb/var/log/mongodb/mongod.log"
12+
# logAppend: true
1213

1314
replication:
1415
replSetName: rs1

platform-nix-idx/supervisord.conf

+26-1
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,34 @@ command=/usr/bin/node /home/user/json-scada/src/cs_data_processor/cs_data_proces
4545
autostart=true
4646
numprocs=1 ; number of processes copies to start (def 1)
4747
directory=/home/user/json-scada/src/cs_data_processor/ ; directory to cwd to before exec (def no cwd)
48-
user=jsonscada ; setuid to this UNIX account to run the program
48+
user=user ; setuid to this UNIX account to run the program
4949
redirect_stderr=true ; redirect proc stderr to stdout (default false)
5050
stdout_logfile=/home/user/json-scada/log/cs_data_processor.log ; stdout log path, NONE for none; default AUTO
5151
stdout_logfile_maxbytes=10MB ; max # logfile bytes b4 rotation (default 50MB)
5252
stdout_logfile_backups=10 ; # of stdout logfile backups (0 means none, default 10)
53+
stdout_capture_maxbytes=10MB ; number of bytes in 'capturemode' (default 0)
54+
55+
[program:server_realtime_auth]
56+
command=/usr/bin/node /home/user/json-scada/src/server_realtime_auth/index.js
57+
autostart=true
58+
numprocs=1 ; number of processes copies to start (def 1)
59+
directory=/home/user/json-scada/src/server_realtime_auth/ ; directory to cwd to before exec (def no cwd)
60+
user=user ; setuid to this UNIX account to run the program
61+
redirect_stderr=true ; redirect proc stderr to stdout (default false)
62+
stdout_logfile=/home/user/json-scada/log/server_realtime_auth.log ; stdout log path, NONE for none; default AUTO
63+
stdout_logfile_maxbytes=10MB ; max # logfile bytes b4 rotation (default 50MB)
64+
stdout_logfile_backups=10 ; # of stdout logfile backups (0 means none, default 10)
65+
stdout_capture_maxbytes=10MB ; number of bytes in 'capturemode' (default 0)
66+
67+
[program:iec104client]
68+
; args: instance# loglevel
69+
command=/home/user/json-scada/bin/iec104client 1 1
70+
autostart=true
71+
numprocs=1 ; number of processes copies to start (def 1)
72+
directory=/home/user/json-scada/bin/ ; directory to cwd to before exec (def no cwd)
73+
user=user ; setuid to this UNIX account to run the program
74+
redirect_stderr=true ; redirect proc stderr to stdout (default false)
75+
stdout_logfile=/home/user/json-scada/log/iec104client.log ; stdout log path, NONE for none; default AUTO
76+
stdout_logfile_maxbytes=10MB ; max # logfile bytes b4 rotation (default 50MB)
77+
stdout_logfile_backups=10 ; # of stdout logfile backups (0 means none, default 10)
5378
stdout_capture_maxbytes=10MB ; number of bytes in 'capturemode' (default 0)

0 commit comments

Comments
 (0)