Replace DabApps things with Torchbox
Also migrate to using host variables rather than a magic list
This commit is contained in:
parent
183972549f
commit
26e084fc77
|
@ -37,8 +37,8 @@
|
||||||
- import_tasks: tasks/dev.yml
|
- import_tasks: tasks/dev.yml
|
||||||
- import_tasks: tasks/media.yml
|
- import_tasks: tasks/media.yml
|
||||||
|
|
||||||
- import_tasks: tasks/dabapps.yml
|
- import_tasks: tasks/torchbox.yml
|
||||||
when: ansible_fqdn in dabapps_hostnames
|
when: is_torchbox
|
||||||
|
|
||||||
- import_tasks: tasks/mac.yml
|
- import_tasks: tasks/mac.yml
|
||||||
when: "'Mac' in ansible_facts.product_name"
|
when: "'Mac' in ansible_facts.product_name"
|
||||||
|
|
|
@ -1,22 +0,0 @@
|
||||||
[Unit]
|
|
||||||
Description=Crab Router
|
|
||||||
Wants=network-online.target
|
|
||||||
After=network-online.target
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
Type=simple
|
|
||||||
User={{ user }}
|
|
||||||
ExecStart=/usr/bin/crab router
|
|
||||||
Environment="CRAB_ROUTER_HOST=0.0.0.0"
|
|
||||||
|
|
||||||
# Allow port 80 bind
|
|
||||||
AmbientCapabilities=CAP_NET_BIND_SERVICE
|
|
||||||
NoNewPrivileges=yes
|
|
||||||
|
|
||||||
# More protections, because why not
|
|
||||||
PrivateDevices=yes
|
|
||||||
PrivateTmp=yes
|
|
||||||
ProtectSystem=full
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
RequiredBy=multi-user.target
|
|
|
@ -22,8 +22,8 @@
|
||||||
amend = commit --amend --no-edit
|
amend = commit --amend --no-edit
|
||||||
|
|
||||||
[include]
|
[include]
|
||||||
{% if ansible_fqdn == "TOO-Work" %}
|
{% if is_torchbox %}
|
||||||
path = ~/.dotfiles/git/work.conf
|
path = ~/.dotfiles/git/torchbox.conf
|
||||||
{% else %}
|
{% else %}
|
||||||
path = ~/.dotfiles/git/personal.conf
|
path = ~/.dotfiles/git/personal.conf
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
@ -34,8 +34,5 @@
|
||||||
[includeIf "gitdir:~/Repositories/"]
|
[includeIf "gitdir:~/Repositories/"]
|
||||||
path = ~/.dotfiles/git/personal.conf
|
path = ~/.dotfiles/git/personal.conf
|
||||||
|
|
||||||
[includeIf "gitdir:~/DabApps/"]
|
|
||||||
path = ~/.dotfiles/git/work.conf
|
|
||||||
|
|
||||||
[includeIf "gitdir:~/SR/"]
|
[includeIf "gitdir:~/SR/"]
|
||||||
path = ~/.dotfiles/git/personal.conf
|
path = ~/.dotfiles/git/personal.conf
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
is_torchbox: true
|
|
@ -1,43 +0,0 @@
|
||||||
- name: Install DabApps packages
|
|
||||||
aur:
|
|
||||||
name: "{{ item }}"
|
|
||||||
become: true
|
|
||||||
become_user: aur_builder
|
|
||||||
loop:
|
|
||||||
- heroku-cli
|
|
||||||
- ngrok
|
|
||||||
- python-aws-mfa
|
|
||||||
|
|
||||||
- name: Clone DabApps Dotfiles
|
|
||||||
git:
|
|
||||||
repo: git@github.com:dabapps/dotfiles
|
|
||||||
dest: "{{ home }}/Projects/dotfiles"
|
|
||||||
force: true
|
|
||||||
become: true
|
|
||||||
become_user: "{{ user }}"
|
|
||||||
|
|
||||||
- name: Install DabApps EditorConfig
|
|
||||||
file:
|
|
||||||
src: "{{ home }}/Projects/dotfiles/.editorconfig"
|
|
||||||
dest: "{{ home }}/Projects/.editorconfig"
|
|
||||||
mode: 0644
|
|
||||||
owner: "{{ user }}"
|
|
||||||
state: link
|
|
||||||
force: true
|
|
||||||
|
|
||||||
- name: Install Crab service
|
|
||||||
template:
|
|
||||||
src: ./files/crab.service
|
|
||||||
dest: /etc/systemd/system/crab.service
|
|
||||||
mode: 0644
|
|
||||||
owner: root
|
|
||||||
group: root
|
|
||||||
|
|
||||||
- name: Install Zoom
|
|
||||||
aur:
|
|
||||||
name: "{{ item }}"
|
|
||||||
become: true
|
|
||||||
become_user: aur_builder
|
|
||||||
loop:
|
|
||||||
- zoom
|
|
||||||
- zoom-firejail
|
|
|
@ -18,7 +18,6 @@
|
||||||
- arduino
|
- arduino
|
||||||
- arduino-cli
|
- arduino-cli
|
||||||
- arduino-builder
|
- arduino-builder
|
||||||
- aws-cli
|
|
||||||
- docker
|
- docker
|
||||||
- docker-compose
|
- docker-compose
|
||||||
- firefox-developer-edition
|
- firefox-developer-edition
|
||||||
|
|
|
@ -0,0 +1,20 @@
|
||||||
|
- name: Install Torchbox packages
|
||||||
|
aur:
|
||||||
|
name: "{{ item }}"
|
||||||
|
become: true
|
||||||
|
become_user: aur_builder
|
||||||
|
loop:
|
||||||
|
- aws-cli
|
||||||
|
- fabric
|
||||||
|
- heroku-cli
|
||||||
|
- python-aws-mfa
|
||||||
|
- vagrant
|
||||||
|
|
||||||
|
- name: Install Zoom
|
||||||
|
aur:
|
||||||
|
name: "{{ item }}"
|
||||||
|
become: true
|
||||||
|
become_user: aur_builder
|
||||||
|
loop:
|
||||||
|
- zoom
|
||||||
|
- zoom-firejail
|
Loading…
Reference in New Issue