Commit 5efe5f1c authored by nanahira's avatar nanahira

updates

parent ca2a3dd5
This diff is collapsed.
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
- name: apt - name: apt
become: true become: true
apt: apt:
# update_cache: true update_cache: true
name: '{{ apt_packages }}' name: '{{ apt_packages }}'
- name: apt autoremove - name: apt autoremove
become: true become: true
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
when: china_mirror when: china_mirror
- name: China mirror for Docker - name: China mirror for Docker
set_fact: set_fact:
mirror_docker: https://mirrors.tuna.tsinghua.edu.cn/docker-ce mirror_docker: https://mirrors.aliyun.com/docker-ce
when: china_mirror_docker when: china_mirror_docker
- name: target distribution for non-sid - name: target distribution for non-sid
set_fact: set_fact:
......
...@@ -41,6 +41,12 @@ ...@@ -41,6 +41,12 @@
executable: '{{pip_executable}}' executable: '{{pip_executable}}'
extra_args: '--no-build-isolation --ignore-installed' extra_args: '--no-build-isolation --ignore-installed'
#when: ansible_python.version.major == 3 #when: ansible_python.version.major == 3
- name: 替换 compose/service.py 文件
become: true
copy:
src: ./docker-service-patch.py
dest: "/usr/local/lib/python{{ ansible_python.version.major }}.{{ ansible_python.version.minor }}/dist-packages/compose/service.py"
backup: yes
- name: docker 创建目录 - name: docker 创建目录
become: true become: true
file: file:
......
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
when: ansible_user_id == "root" or not manual_fish_mode is defined when: ansible_user_id == "root" or not manual_fish_mode is defined
- name: use mycard omf - name: use mycard omf
set_fact: set_fact:
omf_uri: https://code.mycard.moe/nanahira/oh-my-fish omf_uri: https://code.moenext.com/nanahira/oh-my-fish
omf_install_uri_prefix: https://code.mycard.moe/nanahira/oh-my-fish/- omf_install_uri_prefix: https://code.moenext.com/nanahira/oh-my-fish/-
robbyrussell_path: https://code.mycard.moe/nanahira/theme-robbyrussell robbyrussell_path: https://code.moenext.com/nanahira/theme-robbyrussell
when: china_mirror_omf when: china_mirror_omf
- name: use original omf - name: use original omf
set_fact: set_fact:
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
- name: change omf mirror - name: change omf mirror
when: china_mirror_omf when: china_mirror_omf
copy: copy:
content: https://code.mycard.moe/nanahira/omf-packages-main master content: https://code.moenext.com/nanahira/omf-packages-main master
dest: '~/.local/share/omf/repositories' dest: '~/.local/share/omf/repositories'
when: china_mirror_omf and not (ansible_distribution == 'Ubuntu' and ansible_distribution_major_version|int < 22) when: china_mirror_omf and not (ansible_distribution == 'Ubuntu' and ansible_distribution_major_version|int < 22)
- name: 终端环境 fish robbyrussell - name: 终端环境 fish robbyrussell
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
- name: nvidia-patch repo - name: nvidia-patch repo
git: git:
dest: /tmp/nvidia-patch dest: /tmp/nvidia-patch
repo: https://code.mycard.moe/nanahira/nvidia-patch repo: https://code.moenext.com/nanahira/nvidia-patch
recursive: false recursive: false
- name: patch - name: patch
include_tasks: nvidia_patch.yml include_tasks: nvidia_patch.yml
......
...@@ -87,6 +87,7 @@ ...@@ -87,6 +87,7 @@
name: pip name: pip
executable: '{{pip_executable_install}}' executable: '{{pip_executable_install}}'
state: latest state: latest
ignore_errors: true
#when: ansible_python.version.major == 3 #when: ansible_python.version.major == 3
- name: check pip location - name: check pip location
shell: whereis pip | sed -e 's/ /\n/g' | grep bin/pip | tail -n 1 shell: whereis pip | sed -e 's/ /\n/g' | grep bin/pip | tail -n 1
......
...@@ -67,11 +67,11 @@ ...@@ -67,11 +67,11 @@
when: not testing when: not testing
- name: set facts for China mirror - name: set facts for China mirror
set_fact: set_fact:
mirror_debian: http://mirrors.tuna.tsinghua.edu.cn mirror_debian: http://mirrors.aliyun.com
mirror_debian_security: http://mirrors.tuna.tsinghua.edu.cn mirror_debian_security: http://mirrors.aliyun.com
mirror_ubuntu: http://mirrors.tuna.tsinghua.edu.cn mirror_ubuntu: http://mirrors.aliyun.com
mirror_ubuntu_security: http://mirrors.tuna.tsinghua.edu.cn mirror_ubuntu_security: http://mirrors.aliyun.com
mirror_ubuntu_ports: http://mirrors.tuna.tsinghua.edu.cn mirror_ubuntu_ports: http://mirrors.aliyun.com
when: china_mirror when: china_mirror
- name: keep old distribution - name: keep old distribution
set_fact: set_fact:
......
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