google-compute-engine: 20180510 -> 20180905
The list of corresponding NixOS services are also updated
This commit is contained in:
parent
0441faea05
commit
9fb79868ab
|
@ -97,8 +97,8 @@ in
|
||||||
"google-instance-setup.service"
|
"google-instance-setup.service"
|
||||||
"google-network-setup.service"
|
"google-network-setup.service"
|
||||||
];
|
];
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
requires = ["network.target"];
|
requires = ["network.target"];
|
||||||
|
wantedBy = ["multi-user.target"];
|
||||||
path = with pkgs; [ shadow ];
|
path = with pkgs; [ shadow ];
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
|
@ -113,8 +113,8 @@ in
|
||||||
"google-instance-setup.service"
|
"google-instance-setup.service"
|
||||||
"google-network-setup.service"
|
"google-network-setup.service"
|
||||||
];
|
];
|
||||||
requires = [ "network.target" ];
|
requires = ["network.target"];
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = ["multi-user.target"];
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
ExecStart = "${gce}/bin/google_clock_skew_daemon --debug";
|
ExecStart = "${gce}/bin/google_clock_skew_daemon --debug";
|
||||||
|
@ -123,7 +123,7 @@ in
|
||||||
|
|
||||||
systemd.services.google-instance-setup = {
|
systemd.services.google-instance-setup = {
|
||||||
description = "Google Compute Engine Instance Setup";
|
description = "Google Compute Engine Instance Setup";
|
||||||
after = ["fs.target" "network-online.target" "network.target" "rsyslog.service"];
|
after = ["local-fs.target" "network-online.target" "network.target" "rsyslog.service"];
|
||||||
before = ["sshd.service"];
|
before = ["sshd.service"];
|
||||||
wants = ["local-fs.target" "network-online.target" "network.target"];
|
wants = ["local-fs.target" "network-online.target" "network.target"];
|
||||||
wantedBy = [ "sshd.service" "multi-user.target" ];
|
wantedBy = [ "sshd.service" "multi-user.target" ];
|
||||||
|
@ -134,15 +134,17 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.services.google-ip-forwarding-daemon = {
|
systemd.services.google-network-daemon = {
|
||||||
description = "Google Compute Engine IP Forwarding Daemon";
|
description = "Google Compute Engine Network Daemon";
|
||||||
after = ["network.target" "google-instance-setup.service" "google-network-setup.service"];
|
after = ["local-fs.target" "network-online.target" "network.target" "rsyslog.service" "google-instance-setup.service"];
|
||||||
|
wants = ["local-fs.target" "network-online.target" "network.target"];
|
||||||
requires = ["network.target"];
|
requires = ["network.target"];
|
||||||
|
partOf = ["network.target"];
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
path = with pkgs; [ iproute ];
|
path = with pkgs; [ iproute ];
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Type = "simple";
|
ExecStart = "${gce}/bin/google_network_daemon --debug";
|
||||||
ExecStart = "${gce}/bin/google_ip_forwarding_daemon --debug";
|
Type = "oneshot";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -153,8 +155,9 @@ in
|
||||||
"network-online.target"
|
"network-online.target"
|
||||||
"network.target"
|
"network.target"
|
||||||
"rsyslog.service"
|
"rsyslog.service"
|
||||||
|
"systemd-resolved.service"
|
||||||
"google-instance-setup.service"
|
"google-instance-setup.service"
|
||||||
"google-network-setup.service"
|
"google-network-daemon.service"
|
||||||
];
|
];
|
||||||
wants = [ "local-fs.target" "network-online.target" "network.target"];
|
wants = [ "local-fs.target" "network-online.target" "network.target"];
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
@ -167,23 +170,6 @@ in
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
systemd.services.google-network-setup = {
|
|
||||||
description = "Google Compute Engine Network Setup";
|
|
||||||
after = [
|
|
||||||
"local-fs.target"
|
|
||||||
"network-online.target"
|
|
||||||
"network.target"
|
|
||||||
"rsyslog.service"
|
|
||||||
];
|
|
||||||
wants = [ "local-fs.target" "network-online.target" "network.target"];
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
serviceConfig = {
|
|
||||||
ExecStart = "${gce}/bin/google_network_setup --debug";
|
|
||||||
KillMode = "process";
|
|
||||||
Type = "oneshot";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.services.google-startup-scripts = {
|
systemd.services.google-startup-scripts = {
|
||||||
description = "Google Compute Engine Startup Scripts";
|
description = "Google Compute Engine Startup Scripts";
|
||||||
after = [
|
after = [
|
||||||
|
@ -192,9 +178,9 @@ in
|
||||||
"network.target"
|
"network.target"
|
||||||
"rsyslog.service"
|
"rsyslog.service"
|
||||||
"google-instance-setup.service"
|
"google-instance-setup.service"
|
||||||
"google-network-setup.service"
|
"google-network-daemon.service"
|
||||||
];
|
];
|
||||||
wants = [ "local-fs.target" "network-online.target" "network.target"];
|
wants = ["local-fs.target" "network-online.target" "network.target"];
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
ExecStart = "${gce}/bin/google_metadata_script_runner --debug --script-type startup";
|
ExecStart = "${gce}/bin/google_metadata_script_runner --debug --script-type startup";
|
||||||
|
|
|
@ -11,14 +11,14 @@
|
||||||
|
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
name = "google-compute-engine-${version}";
|
name = "google-compute-engine-${version}";
|
||||||
version = "20180510";
|
version = "20180905";
|
||||||
namePrefix = "";
|
namePrefix = "";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "GoogleCloudPlatform";
|
owner = "GoogleCloudPlatform";
|
||||||
repo = "compute-image-packages";
|
repo = "compute-image-packages";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "13hmg29s1pljcvf40lrv5yickg8x51rcnv68wxhs6zkkg75k448p";
|
sha256 = "0095f000kgk2lc5p1y4080sbc0r7ly60a7i9id8hydfnkhqqz75n";
|
||||||
};
|
};
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
Loading…
Reference in a new issue