Merge pull request #536 from SURFscz/add-acc-weblogin

Add acc weblogin
SURFscz · Sep 3, 2024 · ee50ec9 · ee50ec9
2 parents 6a54a1b + 3cf7965
commit ee50ec9
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 13 deletions.
diff --git a/environments/docker/group_vars/demo1.yml b/environments/docker/group_vars/demo1.yml
@@ -12,7 +12,8 @@ demo_containers:
   etherpad: sram-etherpad
   wordpress: sram-wordpress
   wordpress_cli: sram-wordpress-cli
-  weblogin: sram-weblogin
+  weblogin_acc: sram-weblogin-acc
+  weblogin_prd: sram-weblogin-prd
   database: sram-db
 
 demo_images:
@@ -28,10 +29,13 @@ demo_hosts:
 ports:
   etherpad: 9001
   wordpress: 9002
-  weblogin: 2022
+  weblogin_acc: 2022
+  weblogin_prd: 1022
 
-demo1_weblogin_url: https://sbs.scz-vm.net/pam-weblogin
-demo1_weblogin_token: 1234abcd
+demo1_weblogin_url_acc: https://sbs.scz-vm.net/pam-weblogin
+demo1_weblogin_url_prd: https://sbs.scz-vm.net/pam-weblogin
+demo1_weblogin_token_acc: 1234abcd
+demo1_weblogin_token_prd: 1234abcd
 
 # oidc:
 #   demo1:

diff --git a/roles/pam_websso/defaults/main.yml → roles/attic/pam_websso/defaults/main.yml b/roles/pam_websso/defaults/main.yml → roles/attic/pam_websso/defaults/main.yml
diff --git a/roles/pam_websso/files/mkhomedir → roles/attic/pam_websso/files/mkhomedir b/roles/pam_websso/files/mkhomedir → roles/attic/pam_websso/files/mkhomedir
diff --git a/roles/pam_websso/handlers/main.yml → roles/attic/pam_websso/handlers/main.yml b/roles/pam_websso/handlers/main.yml → roles/attic/pam_websso/handlers/main.yml
diff --git a/roles/pam_websso/tasks/main.yml → roles/attic/pam_websso/tasks/main.yml b/roles/pam_websso/tasks/main.yml → roles/attic/pam_websso/tasks/main.yml
diff --git a/roles/pam_websso/templates/nslcd.conf.j2 → .../attic/pam_websso/templates/nslcd.conf.j2 b/roles/pam_websso/templates/nslcd.conf.j2 → .../attic/pam_websso/templates/nslcd.conf.j2
diff --git a/...s/pam_websso/templates/pam_websso.json.j2 → ...c/pam_websso/templates/pam_websso.json.j2 b/...s/pam_websso/templates/pam_websso.json.j2 → ...c/pam_websso/templates/pam_websso.json.j2
diff --git a/roles/pam_websso_daemon/defaults/main.yml → ...attic/pam_websso_daemon/defaults/main.yml b/roles/pam_websso_daemon/defaults/main.yml → ...attic/pam_websso_daemon/defaults/main.yml
diff --git a/roles/pam_websso_daemon/handlers/main.yml → ...attic/pam_websso_daemon/handlers/main.yml b/roles/pam_websso_daemon/handlers/main.yml → ...attic/pam_websso_daemon/handlers/main.yml
diff --git a/roles/pam_websso_daemon/tasks/main.yml → roles/attic/pam_websso_daemon/tasks/main.yml b/roles/pam_websso_daemon/tasks/main.yml → roles/attic/pam_websso_daemon/tasks/main.yml
diff --git a/roles/pam_websso_daemon/tasks/nginx.yml → ...s/attic/pam_websso_daemon/tasks/nginx.yml b/roles/pam_websso_daemon/tasks/nginx.yml → ...s/attic/pam_websso_daemon/tasks/nginx.yml
diff --git a/...websso_daemon/templates/nginx-pam.conf.j2 → ...websso_daemon/templates/nginx-pam.conf.j2 b/...websso_daemon/templates/nginx-pam.conf.j2 → ...websso_daemon/templates/nginx-pam.conf.j2
diff --git a/...daemon/templates/websso-daemon.service.j2 → ...daemon/templates/websso-daemon.service.j2 b/...daemon/templates/websso-daemon.service.j2 → ...daemon/templates/websso-daemon.service.j2
diff --git a/...so_daemon/templates/websso_daemon.json.j2 → ...so_daemon/templates/websso_daemon.json.j2 b/...so_daemon/templates/websso_daemon.json.j2 → ...so_daemon/templates/websso_daemon.json.j2
diff --git a/roles/demo-weblogin/templates/weblogin-cleanup.service.j2 b/roles/demo-weblogin/templates/weblogin-cleanup.service.j2
@@ -7,20 +7,35 @@ Type=oneshot
 WorkingDirectory={{weblogin_basedir}}
 
 # clean up
-ExecStart=-/usr/bin/docker rm -f {{ demo_containers.weblogin }}
-ExecStart=+/bin/rm -rf '{{weblogin_basedir}}/home'
-ExecStart=+/bin/mkdir -p -m0755 '{{weblogin_basedir}}/home'
+ExecStart=-/usr/bin/docker rm -f {{ demo_containers.weblogin_acc }}
+ExecStart=-/usr/bin/docker rm -f {{ demo_containers.weblogin_prd }}
+ExecStart=+/bin/rm -rf '{{weblogin_basedir}}/home_acc'
+ExecStart=+/bin/rm -rf '{{weblogin_basedir}}/home_prd'
+ExecStart=+/bin/mkdir -p -m0755 '{{weblogin_basedir}}/home_acc'
+ExecStart=+/bin/mkdir -p -m0755 '{{weblogin_basedir}}/home_prd'
 
-# start container
+# start container acc
 ExecStart=/usr/bin/docker run -d \
-    -p 0.0.0.0:{{ ports.weblogin }}:22 \
-    -e URL={{ demo1_weblogin_url }} \
-    -e TOKEN={{ demo1_weblogin_token }} \
-    -v {{ weblogin_basedir }}/home:/home:rw \
-    --name {{ demo_containers.weblogin }} \
+    -p 0.0.0.0:{{ ports.weblogin_acc }}:22 \
+    -e URL={{ demo1_weblogin_url_acc }} \
+    -e TOKEN={{ demo1_weblogin_token_acc }} \
+    -v {{ weblogin_basedir }}/home_acc:/home:rw \
+    --name {{ demo_containers.weblogin_acc }} \
     --network {{ internal_network }} \
     --restart always \
     {{ demo_images.weblogin }}
+
+# start container prd
+ExecStart=/usr/bin/docker run -d \
+    -p 0.0.0.0:{{ ports.weblogin_prd }}:22 \
+    -e URL={{ demo1_weblogin_url_prd }} \
+    -e TOKEN={{ demo1_weblogin_token_prd }} \
+    -v {{ weblogin_basedir }}/home_prd:/home:rw \
+    --name {{ demo_containers.weblogin_prd }} \
+    --network {{ internal_network }} \
+    --restart always \
+    {{ demo_images.weblogin }}
+
 SyslogIdentifier=weblogin-cleanup
 
 [Install]