Commit 93f62768 authored by nanahira's avatar nanahira

fix install script

parent b9696547
...@@ -3,4 +3,4 @@ host_key_checking = False ...@@ -3,4 +3,4 @@ host_key_checking = False
strategy_plugins = mitogen-0.2.9/ansible_mitogen/plugins/strategy strategy_plugins = mitogen-0.2.9/ansible_mitogen/plugins/strategy
strategy = mitogen_free strategy = mitogen_free
inventory = ../result/inventory.yaml inventory = ../result/inventory.yaml
forks = 100 forks = 16
...@@ -14,13 +14,14 @@ ...@@ -14,13 +14,14 @@
- git-registry.mycard.moe/railgun/babeld - git-registry.mycard.moe/railgun/babeld
- git-registry.mycard.moe/nanahira/docker-ocserv - git-registry.mycard.moe/nanahira/docker-ocserv
- git-registry.mycard.moe/railgun/openconnect - git-registry.mycard.moe/railgun/openconnect
when: not noBird
- name: unstable source - name: unstable source
become: true become: true
copy: copy:
content: | content: |
deb http://mirrors.tuna.tsinghua.edu.cn/debian unstable main contrib non-free deb http://mirrors.tuna.tsinghua.edu.cn/debian unstable main contrib non-free
dest: /etc/apt/sources.list.d/unstable.list dest: /etc/apt/sources.list.d/unstable.list
when: systemBird and ansible_distribution == 'Debian' when: systemBird and ansible_distribution == 'Debian' and ansible_distribution_release != 'sid'
- name: unstable pref 90 - name: unstable pref 90
become: true become: true
copy: copy:
...@@ -29,7 +30,7 @@ ...@@ -29,7 +30,7 @@
Pin: release a=unstable Pin: release a=unstable
Pin-Priority: 90 Pin-Priority: 90
dest: /etc/apt/preferences.d/limit-unstable dest: /etc/apt/preferences.d/limit-unstable
when: systemBird and ansible_distribution == 'Debian' when: systemBird and ansible_distribution == 'Debian' and ansible_distribution_release != 'sid'
- name: install packages for systemd things - name: install packages for systemd things
become: true become: true
apt: apt:
......
...@@ -144,6 +144,8 @@ class InventoryBuilder { ...@@ -144,6 +144,8 @@ class InventoryBuilder {
ansible_ssh_user: host.user, ansible_ssh_user: host.user,
ansible_ssh_port: host.sshPort || 22, ansible_ssh_port: host.sshPort || 22,
ansible_python_interpreter: host.python || 'python3', ansible_python_interpreter: host.python || 'python3',
noBird: !!(host.noBird || host.sysBird),
systemBird: !!host.sysBird
} }
} }
...@@ -224,8 +226,6 @@ class InventoryBuilder { ...@@ -224,8 +226,6 @@ class InventoryBuilder {
masqInterfaces, masqInterfaces,
dockerServices: host.dockerServices, dockerServices: host.dockerServices,
routePlans, routePlans,
noBird: !!(host.noBird || host.sysBird),
systemBird: !!host.sysBird
}; };
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment