chore: update ansible and batcher service

Author: JuArce

infra/ansible/batcher.yaml

@@ -4,10 +4,10 @@
 - import_playbook: go.yaml
 - import_playbook: eigenlayer-cli.yaml
 
-- hosts: aligned-holesky-batcher
+- hosts: batcher
   become: true
   vars:
-    user: "{{ user }}"
+    service: "batcher"
 
   tasks:
     # Install required packages
@@ -16,32 +16,30 @@
         pkg:
           - pkg-config
           - libssl-dev
-          - gcc
         state: latest
         update_cache: true
 
     # Create directories for each service
     - name: Create directories for each service if do not exist
       ansible.builtin.file:
-        path: /home/{{ user }}/repos/{{ item }}
+        path: /home/{{ ansible_user }}/repos/{{ service }}
         state: directory
         mode: '0755'
-      become_user: "{{ user }}"
-      loop:
-        - batcher
+      become_user: "{{ ansible_user }}"
 
-    # Clone Aligned repository for each service
+    # Clone Aligned repository for the service
     - name: Clone Aligned repository
       ansible.builtin.git:
         repo: https://github.com/yetanotherco/aligned_layer.git
-        dest: /home/{{ user }}/repos/{{ item }}/aligned_layer
-        version: v0.10.2
-      become_user: "{{ user }}"
-      loop:
-        - batcher
-      register: repo_clone
-      failed_when:
-        - repo_clone.failed
-        - not 'Local modifications exist in the destination' in repo_clone.msg
+        dest: /home/{{ ansible_user }}/repos/{{ service }}/aligned_layer
+        version: batcher_ansible
+      become_user: "{{ ansible_user }}"
 
+    # Build the batcher
+    - name: Build Batcher
+      shell: cd /home/{{ ansible_user }}/repos/{{ service }}/aligned_layer && make deps && make install_batcher
+      become_user: "{{ ansible_user }}"
+      environment:
+        PATH: "$PATH:/home/admin/.cargo/bin:/usr/local/go/bin:$GOPATH/bin:/$HOME/go/bin:/usr/bin"
 
+    # Copy systemd service to user services

infra/ansible/eigenlayer-cli.yaml

@@ -1,8 +1,6 @@
 - name: Eigenlayer CLI Setup
   hosts: all
   become: true
-  vars:
-    user: "{{ user }}"
 
   tasks:
     - name: check if eigenlayer is installed
@@ -14,7 +12,7 @@
       when: eigenlayer_exists is failed
       shell:
         cmd: curl -sSfL https://raw.githubusercontent.com/layr-labs/eigenlayer-cli/master/scripts/install.sh  | sh -s
-      become_user: "{{ user }}"
+      become_user: "{{ ansible_user }}"
 
     - name: Add eigenlayer path to ~/.profile
       when: eigenlayer_exists is failed

infra/ansible/rust.yaml

@@ -1,8 +1,6 @@
 - name: Rust Setup
   hosts: all
   become: true
-  vars:
-    user: "{{ user }}"
 
   pre_tasks:
     - name: update repositories
@@ -28,6 +26,6 @@
     - name: install rust/cargo
       when: cargo_exists is failed
       shell: /tmp/sh.rustup.rs -y
-      become_user: "{{ user }}"
+      become_user: "{{ ansible_user }}"
       tags:
         - rust

infra/ansible/setup.yaml

@@ -1,8 +1,6 @@
 - hosts: all
 
   become: true
-  vars:
-    user: "{{ user }}"
 
   tasks:
     # Install required packages
@@ -14,6 +12,7 @@
           - git
           - ufw
           - make
+          - gcc
         state: latest
         update_cache: true
 
@@ -31,10 +30,10 @@
     # Create basic directories
     - name: Create basic directories if do not exist
       ansible.builtin.file:
-        path: /home/{{ user }}/{{ item }}
+        path: /home/{{ ansible_user }}/{{ item }}
         state: directory
         mode: '0755'
-      become_user: "{{ user }}"
+      become_user: "{{ ansible_user }}"
       loop:
         - repos
         - config

infra/ansible/stage_inventory.yaml

@@ -1,19 +1,19 @@
-aggregator:
+#aggregator:
+#  hosts:
+#    aligned-holesky-aggregator-1:
+#      ansible_host: aligned-ansible
+#      ansible_user: admin
+#      app_user: app
+#      ansible_python_interpreter: /usr/bin/python3
+batcher:
   hosts:
-    aligned-holesky-aggregator-1:
-      ansible_host: aligned-ansible
+    aligned-holesky-stage-1:
+      ansible_host: aligned-holesky-stage-1
       ansible_user: admin
-      app_user: app
       ansible_python_interpreter: /usr/bin/python3
-  #batcher:
-  #  hosts:
-  #    aligned-holesky-batcher:
-  #      ansible_host: aligned-holesky-batcher
-  #      ansible_user: admin
-  #      ansible_python_interpreter: /usr/bin/python3
-  #explorer:
-  #  hosts:
-  #    aligned-holesky-explorer:
-  #      ansible_host: aligned-holesky-explorer
-  #      ansible_user: admin
-  #      ansible_python_interpreter: /usr/bin/python3
+#  explorer:
+#    hosts:
+#      aligned-holesky-explorer:
+#        ansible_host: aligned-holesky-explorer
+#        ansible_user: admin
+#        ansible_python_interpreter: /usr/bin/python3

infra/ansible/webserver.yaml

@@ -61,4 +61,4 @@
       service:
         name: caddy
         enabled: yes
-        state: started
+        state: started

infra/services/batcher.service

@@ -4,12 +4,12 @@ After=network.target
 
 [Service]
 Type=simple
-User=ubuntu
-WorkingDirectory=/home/ubuntu/repos/batcher/aligned_layer/batcher
-ExecStart=/home/ubuntu/.cargo/bin/aligned-batcher --config /home/ubuntu/config/config-batcher-holesky.yaml --env-file /home/ubuntu/config/.env.batcher
+WorkingDirectory=/home/{{ ansible_user }}/repos/batcher/aligned_layer/batcher
+ExecStart=/home/{{ ansible_user }}/.cargo/bin/aligned-batcher --config /home/{{ ansible_user }}/config/config-batcher-holesky.yaml --env-file /home/{{ ansible_user }}/config/.env.batcher
 Restart=always
 RestartSec=1
 StartLimitBurst=100
+LimitNOFILE=100000
 
 [Install]
 WantedBy=multi-user.target