Merge pull request #59 from MonolithProjects/develop

Add option to change the service name

Author: MonolithProjects

README.md

@@ -66,7 +66,10 @@ reinstall_runner: no
 hide_sensitive_logs: yes
 
 # GitHub address
-github_server: "https://github.com"
+github_url: "https://github.com"
+
+# GitHub API
+github_api_url: "https://api.github.com"
 
 # Personal Access Token for your GitHub account
 access_token: "{{ lookup('env', 'PERSONAL_ACCESS_TOKEN') }}"
@@ -77,6 +80,9 @@ runner_org: no
 # Name to assign to this runner in GitHub (System hostname as default)
 runner_name: "{{ ansible_hostname }}"
 
+# Custom service name when usign Github Enterprise server
+# service_name: actions.runner._services.{{ runner_name }}.service
+
 # GitHub Repository user or Organization owner used for Runner registration
 # github_account: "youruser"
 

defaults/main.yml

@@ -21,7 +21,10 @@ reinstall_runner: no
 hide_sensitive_logs: yes
 
 # GitHub address
-github_server: "https://github.com"
+github_url: "https://github.com"
+
+# GitHub API
+github_api_url: "https://api.github.com"
 
 # Personal Access Token for your GitHub account
 access_token: "{{ lookup('env', 'PERSONAL_ACCESS_TOKEN') }}"
@@ -32,6 +35,9 @@ runner_org: no
 # Name to assign to this runner in GitHub (System hostname as default)
 runner_name: "{{ ansible_hostname }}"
 
+# Custom service name when usign Github Enterprise server
+# service_name: actions.runner._services.{{ runner_name }}.service
+
 # GitHub Repository user or Organization owner used for Runner registration
 # github_account: "youruser"
 

tasks/collect_info_org.yml

@@ -1,7 +1,7 @@
 ---
 - name: Get registration token (RUN ONCE)
   uri:
-    url: "https://api.github.com/orgs/{{ github_owner | default(github_account) }}/actions/runners/registration-token"
+    url: "{{ github_api_url }}/orgs/{{ github_owner | default(github_account) }}/actions/runners/registration-token"
     headers:
       Authorization: "token {{ access_token }}"
       Accept: "application/vnd.github.v3+json"
@@ -16,7 +16,7 @@
 
 - name: Check currently registered runners (RUN ONCE)
   uri:
-    url: "https://api.github.com/orgs/{{ github_owner | default(github_account) }}/actions/runners"
+    url: "{{ github_api_url }}/orgs/{{ github_owner | default(github_account) }}/actions/runners"
     headers:
       Authorization: "token {{ access_token }}"
       Accept: "application/vnd.github.v3+json"
@@ -38,6 +38,15 @@
 - name: Build service name
   set_fact:
     runner_service: "actions.runner.{{ (github_owner | default(github_account))[:45] }}.{{ runner_name }}.service"
+  when: service_name is not defined
+  tags:
+    - install
+    - uninstall
+
+- name: Build service name
+  set_fact:
+    runner_service: "{{ service_name }}"
+  when: service_name is defined
   tags:
     - install
     - uninstall

tasks/collect_info_repo.yml

@@ -1,7 +1,7 @@
 ---
 - name: Get registration token (RUN ONCE)
   uri:
-    url: "https://api.github.com/repos/{{ github_owner | default(github_account) }}/{{ github_repo }}/actions/runners/registration-token"
+    url: "{{ github_api_url }}/repos/{{ github_owner | default(github_account) }}/{{ github_repo }}/actions/runners/registration-token"
     headers:
       Authorization: "token {{ access_token }}"
       Accept: "application/vnd.github.v3+json"
@@ -16,7 +16,7 @@
 
 - name: Check currently registered runners (RUN ONCE)
   uri:
-    url: "https://api.github.com/repos/{{ github_owner | default(github_account) }}/{{ github_repo }}/actions/runners"
+    url: "{{ github_api_url }}/repos/{{ github_owner | default(github_account) }}/{{ github_repo }}/actions/runners"
     headers:
       Authorization: "token {{ access_token }}"
       Accept: "application/vnd.github.v3+json"
@@ -45,6 +45,15 @@
 - name: Build service name
   set_fact:
     runner_service: "actions.runner.{{ svc_name[:45] }}.{{ runner_name }}.service"
+  when: service_name is not defined
+  tags:
+    - install
+    - uninstall
+
+- name: Build service name
+  set_fact:
+    runner_service: "{{ service_name }}"
+  when: service_name is defined
   tags:
     - install
     - uninstall

tasks/install_runner.yml

@@ -14,10 +14,8 @@
   uri:
     url: "https://api.github.com/repos/actions/runner/releases/latest"
     headers:
-      Authorization: "token {{ access_token }}"
-      Accept: "application/vnd.github.v3+json"
+      Content-Type: "application/json"
     method: GET
-    force_basic_auth: yes
     return_content: yes
     status_code: 200
     body_format: json
@@ -81,7 +79,7 @@
     - install
 
 - name: Register runner (if new installation) for repo
-  command: "{{ runner_dir }}/./config.sh --url {{ github_server }}/{{ github_owner | default(github_account) }}/{{ github_repo }} \
+  command: "{{ runner_dir }}/./config.sh --url {{ github_url }}/{{ github_owner | default(github_account) }}/{{ github_repo }} \
             --token {{ registration.json.token }} --name {{ runner_name }} --unattended"
   args:
     chdir: "{{ runner_dir }}"
@@ -93,7 +91,7 @@
     - install
 
 - name: Register runner (if new installation) for organization
-  command: "{{ runner_dir }}/./config.sh --url {{ github_server }}/{{ github_owner | default(github_account) }} \
+  command: "{{ runner_dir }}/./config.sh --url {{ github_url }}/{{ github_owner | default(github_account) }} \
             --token {{ registration.json.token }} --name {{ runner_name }} --unattended"
   args:
     chdir: "{{ runner_dir }}"
@@ -105,7 +103,7 @@
     - install
 
 - name: Replace registered runner for repo
-  command: "{{ runner_dir }}/config.sh --url {{ github_server }}/{{ github_owner | default(github_account) }}/{{ github_repo }} \
+  command: "{{ runner_dir }}/config.sh --url {{ github_url }}/{{ github_owner | default(github_account) }}/{{ github_repo }} \
             --token {{ registration.json.token }} --name {{ runner_name }} --unattended --replace"
   args:
     chdir: "{{ runner_dir }}"
@@ -117,7 +115,7 @@
     - install
 
 - name: Replace registered runner for organization
-  command: "{{ runner_dir }}/config.sh --url {{ github_server }}/{{ github_owner | default(github_account) }} \
+  command: "{{ runner_dir }}/config.sh --url {{ github_url }}/{{ github_owner | default(github_account) }} \
             --token {{ registration.json.token }} --name {{ runner_name }} --unattended --replace"
   args:
     chdir: "{{ runner_dir }}"