From 60554d1be796fe646c1b0efeb6e112ecdcab89b1 Mon Sep 17 00:00:00 2001 From: Daniel Poelzleithner Date: Tue, 16 Apr 2019 12:32:00 +0200 Subject: [PATCH 1/4] add iotop --- hosts/containers/feile/configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/containers/feile/configuration.nix b/hosts/containers/feile/configuration.nix index b49ef411..765c52ce 100644 --- a/hosts/containers/feile/configuration.nix +++ b/hosts/containers/feile/configuration.nix @@ -82,6 +82,7 @@ gitAndTools.git mpv + iotop # libmagic how ? ]; From 5f882defe0d5d07aa1f58a4ae0c41c166597ea31 Mon Sep 17 00:00:00 2001 From: Daniel Poelzleithner Date: Tue, 16 Apr 2019 12:32:26 +0200 Subject: [PATCH 2/4] allow large image uploads --- hosts/containers/registry/configuration.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hosts/containers/registry/configuration.nix b/hosts/containers/registry/configuration.nix index 22833674..f9e0d071 100644 --- a/hosts/containers/registry/configuration.nix +++ b/hosts/containers/registry/configuration.nix @@ -90,6 +90,10 @@ locations."/" = { proxyPass = "http://localhost:5000"; }; + extraConfig = '' + client_max_body_size 2048M; + gzip off; + ''; }; # This value determines the NixOS release with which your system is to be From 2dcf9846ae3ead1678b35275f36537b56857ad01 Mon Sep 17 00:00:00 2001 From: Daniel Poelzleithner Date: Tue, 16 Apr 2019 13:17:19 +0200 Subject: [PATCH 3/4] start ansible project for hypervisors and non nix hosts, switch to ansible for ease of existence --- ansible/ansible.cfg | 5 +++++ ansible/hosts | 5 +++++ ansible/hypervisor.yml | 5 +++++ ansible/roles/proxmox/tasks/main.yml | 25 +++++++++++++++++++++++++ 4 files changed, 40 insertions(+) create mode 100644 ansible/ansible.cfg create mode 100644 ansible/hosts create mode 100644 ansible/hypervisor.yml create mode 100644 ansible/roles/proxmox/tasks/main.yml diff --git a/ansible/ansible.cfg b/ansible/ansible.cfg new file mode 100644 index 00000000..0a7eb0d4 --- /dev/null +++ b/ansible/ansible.cfg @@ -0,0 +1,5 @@ +[defaults] + +# some basic default values... + +inventory = ./hosts \ No newline at end of file diff --git a/ansible/hosts b/ansible/hosts new file mode 100644 index 00000000..bae11c49 --- /dev/null +++ b/ansible/hosts @@ -0,0 +1,5 @@ +[hypervisor] +server3.hq.c3d2.de +server4.hq.c3d2.de +server5.hq.c3d2.de +server6.hq.c3d2.de diff --git a/ansible/hypervisor.yml b/ansible/hypervisor.yml new file mode 100644 index 00000000..8004c1ab --- /dev/null +++ b/ansible/hypervisor.yml @@ -0,0 +1,5 @@ +--- +# file: hypervisor.yml +- hosts: hypervisor + roles: + - proxmox diff --git a/ansible/roles/proxmox/tasks/main.yml b/ansible/roles/proxmox/tasks/main.yml new file mode 100644 index 00000000..bd9b3528 --- /dev/null +++ b/ansible/roles/proxmox/tasks/main.yml @@ -0,0 +1,25 @@ +--- +- name: Update all packages to the latest version + apt: + upgrade: dist +- name: Install packages + apt: + name: "{{ packages }}" + vars: + packages: + - zsh + - iotop + - latencytop + - htop + +- name: Cloning oh-my-zsh + git: + repo=https://github.com/robbyrussell/oh-my-zsh + dest=~/.oh-my-zsh + +- name: Link ~/.zshrc + file: + src: /etc/pve/zshrc + dest: ~/.zshrc + state: link + force: yes \ No newline at end of file From 364de37a7e6d74e897c54aa426a0eefcb169ba99 Mon Sep 17 00:00:00 2001 From: Astro Date: Tue, 30 Apr 2019 23:19:21 +0200 Subject: [PATCH 4/4] update secrets submodule --- secrets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/secrets b/secrets index ae9bd8f1..3fbfe2f9 160000 --- a/secrets +++ b/secrets @@ -1 +1 @@ -Subproject commit ae9bd8f1429a06c819e72266614a382b5bc7cdea +Subproject commit 3fbfe2f9a6949fee19d70c97d2e5ca27f9d6539f