aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Gonçalves <me@rgoncalves.se>2021-12-30 15:47:55 +0000
committerRomain Gonçalves <me@rgoncalves.se>2021-12-30 15:50:40 +0000
commitd26061f41849376ed9c63ac34ceb74eed9ec7f29 (patch)
treefcc75c2b668530c93d403532cad0e7c4c40417e2
parent6b106cce38106e7beb9db623a9d98784cb8bbc86 (diff)
downloadrules-d26061f41849376ed9c63ac34ceb74eed9ec7f29.tar.gz
dc0: Migrate git stuff to ungleich vps
Moving a bunch of git related services (git users, repository and cgit web interface) from physical servers to ungleich cloud.
l---------files/keys/git-internal/ws-bare01.pub1
l---------files/keys/git-internal/ws-think01.pub1
l---------files/keys/git-internal/ws-think02.pub1
l---------files/keys/git-internal/ws-xps01.pub1
-rw-r--r--host_vars/dc0.yml6
-rw-r--r--host_vars/stack0-dev0.yml8
-rw-r--r--site.all.yml7
7 files changed, 21 insertions, 4 deletions
diff --git a/files/keys/git-internal/ws-bare01.pub b/files/keys/git-internal/ws-bare01.pub
new file mode 120000
index 0000000..22fbbe2
--- /dev/null
+++ b/files/keys/git-internal/ws-bare01.pub
@@ -0,0 +1 @@
+../ws-bare01.pub \ No newline at end of file
diff --git a/files/keys/git-internal/ws-think01.pub b/files/keys/git-internal/ws-think01.pub
new file mode 120000
index 0000000..c9c5bab
--- /dev/null
+++ b/files/keys/git-internal/ws-think01.pub
@@ -0,0 +1 @@
+../ws-think01.pub \ No newline at end of file
diff --git a/files/keys/git-internal/ws-think02.pub b/files/keys/git-internal/ws-think02.pub
new file mode 120000
index 0000000..0616848
--- /dev/null
+++ b/files/keys/git-internal/ws-think02.pub
@@ -0,0 +1 @@
+../ws-think02.pub \ No newline at end of file
diff --git a/files/keys/git-internal/ws-xps01.pub b/files/keys/git-internal/ws-xps01.pub
new file mode 120000
index 0000000..7ceb448
--- /dev/null
+++ b/files/keys/git-internal/ws-xps01.pub
@@ -0,0 +1 @@
+../ws-xps01.pub \ No newline at end of file
diff --git a/host_vars/dc0.yml b/host_vars/dc0.yml
index 970778f..511ffcc 100644
--- a/host_vars/dc0.yml
+++ b/host_vars/dc0.yml
@@ -1,4 +1,5 @@
httpd_use_nfs: false
+git_dir: /var/www/data/git
ansible_port: 71
@@ -24,3 +25,8 @@ __services:
- name: https
protocol: tcp
port: 443
+
+ - name: cgit
+ domain: git
+ protocol: tcp
+ port: 1235
diff --git a/host_vars/stack0-dev0.yml b/host_vars/stack0-dev0.yml
index 98db313..550d25b 100644
--- a/host_vars/stack0-dev0.yml
+++ b/host_vars/stack0-dev0.yml
@@ -9,7 +9,7 @@ __services:
protocol: tcp
port: 22
- - name: cgit
- domain: git
- protocol: tcp
- port: 1235
+# - name: cgit
+# domain: git
+# protocol: tcp
+# port: 1235
diff --git a/site.all.yml b/site.all.yml
index dd11097..01b825b 100644
--- a/site.all.yml
+++ b/site.all.yml
@@ -22,8 +22,15 @@
tags: role_relayd
- role: acme
tags: role_acme
+ - role: cgit
+ tags: role_cgit
- role: znc
tags: role_znc
+ # internal git user and directory - different than the public one for cgit
+ - role: git
+ git_dir: /data/git-internal
+ git_user: git-internal
+ tags: role_git
- hosts: stack0
roles:
remember that computers suck.