diff --git a/greenlightv3_scripts.yml b/greenlightv3_scripts.yml
new file mode 100644
index 0000000..a6835dc
--- /dev/null
+++ b/greenlightv3_scripts.yml
@@ -0,0 +1,8 @@
+---
+- hosts: "{{ target }}"
+ remote_user: core
+ become: yes
+ roles:
+ - greenlightv3
+
+...
\ No newline at end of file
diff --git a/host_vars/bbb.kolpingbildung.de b/host_vars/bbb.kolpingbildung.de
new file mode 100644
index 0000000..02aeb59
--- /dev/null
+++ b/host_vars/bbb.kolpingbildung.de
@@ -0,0 +1,37 @@
+---
+install_image:
+ path: /root/.oldroot/nfs/install/installimage
+ raid: yes -l 1
+ image: /root/.oldroot/nfs/images/Ubuntu-2004-focal-64-minimal.tar.gz
+ drives: sda,sdb
+
+passwordless_sudo: true
+
+# bobby $6$A7Sw5gku7$0WqY/Z4Ei0axG.mZwDQlFJfK8Rtx6H0eKuP8CW23V5f/5j9sXendknLtXexQfgDzA4Ri55ZqhJnpf05MJV71J0
+# Passwort für root ist bobby, muss hier im Klartext angegeben werden
+password: bobby
+
+# root hat kein keypair, nur ein .ssh Verzeichnis mit hohgeladener authorized_keys Datei
+# ssh_key_root: /root/.ssh/id_rsa.pub
+
+ssh_key_core: /home/core/.ssh/id_rsa.pub
+
+default_presentation: rudiDefault.pdf
+
+default_secret: xMVeVwK5fO1BlUWerThkvbEHV514j8S6uTZXoz0k
+
+# BBB-Settings
+
+# bigbluebutton.properties
+defaultWelcomeMessage: defaultWelcomeMessage=Willkommen zu %%CONFNAME%%
+defaultWelcomeMessageFooter: defaultWelcomeMessageFooter=BigBlueButton
+learningDashboardEnabled: learningDashboardEnabled=false
+defaultDialAccessNumber: defaultDialAccessNumber=095129909624
+# defaultDialAccessNumber: defaultDialAccessNumber=613-555-1234
+
+disableRecordingDefault: disableRecordingDefault=false
+webcamsOnlyForModerator: webcamsOnlyForModerator=false
+learningDashboardCleanupDelayInMinutes: learningDashboardCleanupDelayInMinutes=0
+bigbluebutton_web_logoutURL: bigbluebutton.web.logoutURL=https://wikipedia.de
+
+# settings.yml
\ No newline at end of file
diff --git a/host_vars/bbb.xitq.de b/host_vars/bbb.xitq.de
index c6ada3a..6dc2c54 100644
--- a/host_vars/bbb.xitq.de
+++ b/host_vars/bbb.xitq.de
@@ -2,7 +2,7 @@
install_image:
path: /root/.oldroot/nfs/install/installimage
raid: yes -l 1
- image: /root/.oldroot/nfs/images/Ubuntu-2004-focal-64-minimal.tar.gz
+ image: /root/.oldroot/nfs/images/Ubuntu-2204-jammy-arm64-base.tar.gz
drives: sda,sdb
passwordless_sudo: true
@@ -28,7 +28,6 @@ bigbluebutton_web_logoutURL: bigbluebutton.web.logoutURL=https://open-diakonie.d
-
#install_vm:
# osvariant: ubuntu20.04
# image: /home/core/tmp/ubuntu-22.04.1-live-server-amd64.iso
diff --git a/host_vars/bbb2.open-diakonie.de b/host_vars/bbb2.open-diakonie.de
index 3138007..16cc0c1 100644
--- a/host_vars/bbb2.open-diakonie.de
+++ b/host_vars/bbb2.open-diakonie.de
@@ -18,6 +18,7 @@ ssh_key_core: /home/core/.ssh/id_rsa.pub
default_presentation: rudiDefault.pdf
+default_secret: Pkqrrf7nDWUBkdpzTNq4jnuXVq82uFKLSfYh1ouBvg
# BBB-Settings
diff --git a/host_vars/root3.sdw.systems b/host_vars/root3.sdw.systems
new file mode 100644
index 0000000..02aeb59
--- /dev/null
+++ b/host_vars/root3.sdw.systems
@@ -0,0 +1,37 @@
+---
+install_image:
+ path: /root/.oldroot/nfs/install/installimage
+ raid: yes -l 1
+ image: /root/.oldroot/nfs/images/Ubuntu-2004-focal-64-minimal.tar.gz
+ drives: sda,sdb
+
+passwordless_sudo: true
+
+# bobby $6$A7Sw5gku7$0WqY/Z4Ei0axG.mZwDQlFJfK8Rtx6H0eKuP8CW23V5f/5j9sXendknLtXexQfgDzA4Ri55ZqhJnpf05MJV71J0
+# Passwort für root ist bobby, muss hier im Klartext angegeben werden
+password: bobby
+
+# root hat kein keypair, nur ein .ssh Verzeichnis mit hohgeladener authorized_keys Datei
+# ssh_key_root: /root/.ssh/id_rsa.pub
+
+ssh_key_core: /home/core/.ssh/id_rsa.pub
+
+default_presentation: rudiDefault.pdf
+
+default_secret: xMVeVwK5fO1BlUWerThkvbEHV514j8S6uTZXoz0k
+
+# BBB-Settings
+
+# bigbluebutton.properties
+defaultWelcomeMessage: defaultWelcomeMessage=Willkommen zu %%CONFNAME%%
+defaultWelcomeMessageFooter: defaultWelcomeMessageFooter=BigBlueButton
+learningDashboardEnabled: learningDashboardEnabled=false
+defaultDialAccessNumber: defaultDialAccessNumber=095129909624
+# defaultDialAccessNumber: defaultDialAccessNumber=613-555-1234
+
+disableRecordingDefault: disableRecordingDefault=false
+webcamsOnlyForModerator: webcamsOnlyForModerator=false
+learningDashboardCleanupDelayInMinutes: learningDashboardCleanupDelayInMinutes=0
+bigbluebutton_web_logoutURL: bigbluebutton.web.logoutURL=https://wikipedia.de
+
+# settings.yml
\ No newline at end of file
diff --git a/hosts b/hosts
index b9b5405..6b49894 100644
--- a/hosts
+++ b/hosts
@@ -1,5 +1,7 @@
+
+root3.sdw.systems
# bbb.xitq.de
# bbb1.open-diakonie.d#
# bbb2.open-diakonie.de
# bbb.bfwbb-lernen.de
-bbb0.sdw.systems
\ No newline at end of file
+# bbb0.sdw.systems
\ No newline at end of file
diff --git a/roles/bbb_install/files/kolpingbaDefault.pdf b/roles/bbb_install/files/kolpingbaDefault.pdf
new file mode 100644
index 0000000..e1aba56
Binary files /dev/null and b/roles/bbb_install/files/kolpingbaDefault.pdf differ
diff --git a/roles/bbb_install/files/update b/roles/bbb_install/files/update
index 343777d..cfeab01 100644
--- a/roles/bbb_install/files/update
+++ b/roles/bbb_install/files/update
@@ -9,6 +9,10 @@ sudo cp ~/Scripte/customerDefault.pdf /var/www/bigbluebutton-default/default.pdf
sudo bbb-conf --setip `hostname`
+# sudo bbb-conf --setsecret
+
+sudo bbb-conf --restart
+
exit 0
vhosts=( vhost )
diff --git a/roles/bbb_install/tasks/config_bbb.yml b/roles/bbb_install/tasks/config_bbb.yml
index 18e4a92..73d54c3 100644
--- a/roles/bbb_install/tasks/config_bbb.yml
+++ b/roles/bbb_install/tasks/config_bbb.yml
@@ -29,6 +29,14 @@
- { From: '^learningDashboardCleanupDelayInMinutes=(.*)$', To: '{{ learningDashboardCleanupDelayInMinutes }}'}
- { From: '^bigbluebutton\.web\.logoutURL=(.*)$', To: '{{ bigbluebutton_web_logoutURL }}'}
+
+- name: Write default secret to update script
+ lineinfile:
+ path: /home/core/Scripte/update
+ regexp: '^.*setsecret.*$'
+ line: '# sudo bbb-conf --setsecret {{ default_secret }}'
+ backrefs: yes
+
- name: Configure turn and stun service and default presentation using update script and restart BBB
command:
cmd: "/home/core/Scripte/update"
diff --git a/roles/bbb_install/tasks/install_bbb.yml b/roles/bbb_install/tasks/install_bbb.yml
index f334a23..fe47dfa 100644
--- a/roles/bbb_install/tasks/install_bbb.yml
+++ b/roles/bbb_install/tasks/install_bbb.yml
@@ -10,7 +10,7 @@
- name: Execute bbb-install script only if /usr/share/bigbluebutton/license.txt does not exist
command:
- cmd: "/root/bbb-install-2.7.sh -v focal-270 -s {{ inventory_hostname }} -e benedikt.wismans@sdw.systems -c service.sdw.systems:3ef948d61ff4bcf3e87f068dfecbbbe6"
+ cmd: "/root/bbb-install-2.7.sh -g -v focal-270 -s {{ inventory_hostname }} -e benedikt.wismans@sdw.systems -c service.sdw.systems:3ef948d61ff4bcf3e87f068dfecbbbe6"
chdir: /root
creates: /usr/share/bigbluebutton/license.txt
diff --git a/roles/bs_users/files/authorized_keys_core b/roles/bs_users/files/authorized_keys_core
index d087ebb..e66643c 100644
--- a/roles/bs_users/files/authorized_keys_core
+++ b/roles/bs_users/files/authorized_keys_core
@@ -4,3 +4,5 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDdvEW4c8+OqO3bdc+5JonpEADbR304X5zXI5j9cORO
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSU++o+8yN2V9ojFnnHgkj7QgciurCxcK5b0Yei/I9BmwE8uAWgQR4DJw3iAkV+NSVJ0dsiqGwc6I9f8e9IsTStfcSlwYA8VENuFSelVu0Xph0CY8jPKV8h6gEM8+AQd4iYUgJeROtEkNZhh3D/ZC68ap5VxfF4PrHeDu0jE0C1fG6MGJ5btgI7IWAoaAkSAtoxC9latnFDhFBNmnJmq+d0DNNPBKoB5DG9wQvVxpeuuKzSZyDv87N3/28Uo8JqLm3r4ftBU0sWctymRS0Z5EDqHlLNFQdqQeSzPtQeNh5QOEKH+aa9aAsjINOaEpI2uIe0EYAmBOMjyzvi5BRy6AJ benediktwismans@vhostbbb
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC8g5FOIInITmq8oOSy/CUmIWhOWFnqpBHhNweohK1SWHRjg8/kySZo4PwS2sKCGkZpTelnJjoVY3rBaZBb75HEn0BSRhZ2FPIviD3+ymXLvGgA9ewkms2s78jvhmr3iZSOH+PXZ0vhobrzzh2e2ZuyqsP/cTdc8KQOV3HFzkXfi7sLbGbKSuXwHqEwImj6KJ5Z0g0e1YxPQtkhpwtKkMhC7kgzK5HTEE7xh7DePG6i5gD9E/XXEGxKMPcDAff6YM31MVy0n+2LQ2fz7rFdmceHtYY9f6XijYuOBiNlNmvtD+zcO2Q44nUipkDkFBUYZeTXxfE8xf3rbmpBX5f3WNprUrNmnG1elgsWOa6yxoAL0ZGCfdSboS68JxTG9JxM2lKOv/jUc/0zwkiKkOX24ZnCAmBBh+zT4rNlJbA2dYVTl0+B5PNA2JlXbpkOJgGlvt6gT7N5fvHfVhvVPWbGRPUksk8aP+0jSZWIWN0tF3aXTagOi+5fwx1pNQcZQobQThk= core@px-core4five-p1.rummelsberger.local
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCV4amm6qrzqUfdjXftZCg37875duFRpJYkexQjtHpFRSR5Jk+m01MtQEwns4Ou6qlLhXUUZDhxGaktg5Bme8tMzp/AQ8mcKO4LfXVV+yAqbkJCYNHuAGJpNOaC9H8RdjuvN0wFq8lLiE4vGIbc2L5NPDzGYzoNTU8ubpqzvLldLqm46yL6uTdTOCCDNQuJV1oW6qj28R7AU5eKqYYib040RDdLkPZeTxGaEo+yy1vbR8dO0fU1HtT6gNay2F9nKsfPCXOk3ZU8ra5qA+ri9LK1GHCg8wM4FrJF22njrEJN/WBbjR7BXii4uqmrx+3RcYQrtJsAHjW3pUjkaROgBWjonlxSTkL7hcJmSBhXw3Uop8wVY7y8ntUbS6kBMhaZkYRfs2tekDoR5NmhcBAZtDmyI+MqVDUeg0biIRLDtCA5+pXpiBxgLf3NEf/E5kHPdrW+Na/ioO3b+aHO0124XfCTWjYPasw80hkLKRl1sHR/G7ZIMwVPk/6BzkwV8V95Fms= benediktwismans@sdwmacair
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEzVujtX89AvW7jdpgV7C/cu326h8knw3bgobYZMOwXj core@od-core4five-p1.rummelsberger.local
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDJp0qB/CooqFyUyf2yJ+G/VIylxkOpBK8mqEEJzcXUuCcbVYc0EbaJ0SQorSUiOWzlTRCvmeS28SuX8k1Pb5jAoBtqhaq4QjzuW6dj6vtJZXBYych8XVXqV0o59OR+Frm1f7AtktqOAVZlq20tAz1h/j1ql1TEGSPjZ6QI/bGSlEEtlZePKSW98oMwLJ/ryr1blsxWNmXTnmH9hSeloN967lxFMO47+czcPY/FFsBcwsETxPlZFz7NE+LBja4DwzqxcarxxYbAYsyQT6wJQB1nFgO/vcHyQGT/bf77WahCjcStTQ33LMuXr0GN3y7hoxhRVfXsyKA+WnImrxNrgLfbIcJA3mS7zokBJqIXncIyR3ikl2BJwEib37FHBIN2XohYfTtuaiGeleeLnvEC0Wm0uPSxRZ/FpalI/ODOADPoF0lspak4TnICxQNIkYGVVXKlt3gpI85c5/FD5oRLVpcYZoIOBeyuAsmQq0FgRTEE+JxLRlCd6FH+CGkPYED+DT8= benediktwismans@sdwmacminiM2pro
diff --git a/roles/bs_users/files/authorized_keys_root b/roles/bs_users/files/authorized_keys_root
index 2d5874b..b632c52 100644
--- a/roles/bs_users/files/authorized_keys_root
+++ b/roles/bs_users/files/authorized_keys_root
@@ -1,4 +1,6 @@
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDLGR3klHdPzj5rOwoce8JdvkMGXoTSXdp66JhYYO4t5hWQRB+DZjvhpSBjvtKZZH07wHS0Ya69baDmwHiOhzhNwcs3hwi/I2k/ABSjmjRNNAMlxauHvaRviFYtx5/h7ZayKW9gpxU4e22/9k0F9XAaWkN8Mc7PgvagUy9POpP19gyBBS35kjFIKjOMrz1nQ+9jwUza7lARryctnDoaiUd7DHsLfvSa8Q1fVNUka+k0H1YtRxfsdU8CdMrQf+bDtUTjJupyT5xFphXEle31E49+WAsYGwXkpmQA4zM6E1gOJ0rgnmm/DFJeJ/DYaYP79XzwjvJxNSVMRAg6t5P5z93x benediktwismans@macmini
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDSqGfwbqDQdkjG8s/iCVYlsXcVzScjm/D5xZ11AnWWTZ2rL4BitjYgTNx+3SRoM6K8mUYHFi5tTw3X5ZWcjIj+4UXqONA0pCfkVSo24obIqiCXa7+ZyI7MEW/lGmt4u02fJYCrrzxZCfHd3qR3hFAfv1b188ebEMDYpDORAek0PtMoKHVpNZDK9EBNotT7v92WGFngNSLd4qqnUexEd89zsv9mDlttQe6Z5oIHeFIpu0VsaOQiKXQHcKdwwsXdoTG7q989jJ9kRb3lC/Bs+fpzKd8Q/rPGLSkpJUA4RN6f7ZXJ7fQ86zNGZ7MsskcHJyQCdFPV/ESXNV9rabE6DX73 benediktwismans@acer
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDdvEW4c8+OqO3bdc+5JonpEADbR304X5zXI5j9cOROK0XmK0BQVBrmimlcguEcBPinFRC7XaWgxH70bzPBcwTNVCQOzcAAF3zyuDFfLE5Kv5+vxp0g41AERYLC27Smwo8hQ/ckO+RSxFgM5FKTLErSqXdbtGMlFqA0b/auZhXDHXE+7ft8TSVFnTusrlYovNqwK3wuGHB2xs6gEqlVw5DVwhRsO/hq6pdoSx35GygQYWWPwY8vCSXaqrKbakG9GA0u4TqLE8StpnItEPfvQ3Fe/8AptC4u4JgYuucYZjFOQqzJdv0KHqKOriy7RdO01HxS6Ts7VnbvAc5aL8jZF9bl benediktwismans@intel
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCV4amm6qrzqUfdjXftZCg37875duFRpJYkexQjtHpFRSR5Jk+m01MtQEwns4Ou6qlLhXUUZDhxGaktg5Bme8tMzp/AQ8mcKO4LfXVV+yAqbkJCYNHuAGJpNOaC9H8RdjuvN0wFq8lLiE4vGIbc2L5NPDzGYzoNTU8ubpqzvLldLqm46yL6uTdTOCCDNQuJV1oW6qj28R7AU5eKqYYib040RDdLkPZeTxGaEo+yy1vbR8dO0fU1HtT6gNay2F9nKsfPCXOk3ZU8ra5qA+ri9LK1GHCg8wM4FrJF22njrEJN/WBbjR7BXii4uqmrx+3RcYQrtJsAHjW3pUjkaROgBWjonlxSTkL7hcJmSBhXw3Uop8wVY7y8ntUbS6kBMhaZkYRfs2tekDoR5NmhcBAZtDmyI+MqVDUeg0biIRLDtCA5+pXpiBxgLf3NEf/E5kHPdrW+Na/ioO3b+aHO0124XfCTWjYPasw80hkLKRl1sHR/G7ZIMwVPk/6BzkwV8V95Fms= benediktwismans@sdwmacair
\ No newline at end of file
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCV4amm6qrzqUfdjXftZCg37875duFRpJYkexQjtHpFRSR5Jk+m01MtQEwns4Ou6qlLhXUUZDhxGaktg5Bme8tMzp/AQ8mcKO4LfXVV+yAqbkJCYNHuAGJpNOaC9H8RdjuvN0wFq8lLiE4vGIbc2L5NPDzGYzoNTU8ubpqzvLldLqm46yL6uTdTOCCDNQuJV1oW6qj28R7AU5eKqYYib040RDdLkPZeTxGaEo+yy1vbR8dO0fU1HtT6gNay2F9nKsfPCXOk3ZU8ra5qA+ri9LK1GHCg8wM4FrJF22njrEJN/WBbjR7BXii4uqmrx+3RcYQrtJsAHjW3pUjkaROgBWjonlxSTkL7hcJmSBhXw3Uop8wVY7y8ntUbS6kBMhaZkYRfs2tekDoR5NmhcBAZtDmyI+MqVDUeg0biIRLDtCA5+pXpiBxgLf3NEf/E5kHPdrW+Na/ioO3b+aHO0124XfCTWjYPasw80hkLKRl1sHR/G7ZIMwVPk/6BzkwV8V95Fms= benediktwismans@sdwmacair
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEzVujtX89AvW7jdpgV7C/cu326h8knw3bgobYZMOwXj core@od-core4five-p1.rummelsberger.local
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDJp0qB/CooqFyUyf2yJ+G/VIylxkOpBK8mqEEJzcXUuCcbVYc0EbaJ0SQorSUiOWzlTRCvmeS28SuX8k1Pb5jAoBtqhaq4QjzuW6dj6vtJZXBYych8XVXqV0o59OR+Frm1f7AtktqOAVZlq20tAz1h/j1ql1TEGSPjZ6QI/bGSlEEtlZePKSW98oMwLJ/ryr1blsxWNmXTnmH9hSeloN967lxFMO47+czcPY/FFsBcwsETxPlZFz7NE+LBja4DwzqxcarxxYbAYsyQT6wJQB1nFgO/vcHyQGT/bf77WahCjcStTQ33LMuXr0GN3y7hoxhRVfXsyKA+WnImrxNrgLfbIcJA3mS7zokBJqIXncIyR3ikl2BJwEib37FHBIN2XohYfTtuaiGeleeLnvEC0Wm0uPSxRZ/FpalI/ODOADPoF0lspak4TnICxQNIkYGVVXKlt3gpI85c5/FD5oRLVpcYZoIOBeyuAsmQq0FgRTEE+JxLRlCd6FH+CGkPYED+DT8= benediktwismans@sdwmacminiM2pro
diff --git a/roles/greenlightv3/files/backup b/roles/greenlightv3/files/backup
new file mode 100644
index 0000000..972cccc
--- /dev/null
+++ b/roles/greenlightv3/files/backup
@@ -0,0 +1,4 @@
+docker-compose exec postgres pg_dump \
+ --dbname=greenlight-v3-production\
+ --username=postgres \
+ > /root/greenlight-v3/glv3backup.sql
\ No newline at end of file
diff --git a/roles/greenlightv3/files/build b/roles/greenlightv3/files/build
new file mode 100644
index 0000000..9676bdc
--- /dev/null
+++ b/roles/greenlightv3/files/build
@@ -0,0 +1,3 @@
+docker-compose pull
+docker-compose down
+docker-compose up -d
\ No newline at end of file
diff --git a/roles/greenlightv3/files/makeAdmin b/roles/greenlightv3/files/makeAdmin
new file mode 100644
index 0000000..d6bfbcc
--- /dev/null
+++ b/roles/greenlightv3/files/makeAdmin
@@ -0,0 +1 @@
+docker exec -it greenlight-v3 bundle exec rake user:set_admin_role['admin@sdw.systems']
\ No newline at end of file
diff --git a/roles/greenlightv3/files/postgres b/roles/greenlightv3/files/postgres
new file mode 100644
index 0000000..904e283
--- /dev/null
+++ b/roles/greenlightv3/files/postgres
@@ -0,0 +1 @@
+docker-compose exec postgres bash
\ No newline at end of file
diff --git a/roles/greenlightv3/tasks/upload_scripte b/roles/greenlightv3/tasks/upload_scripte
new file mode 100644
index 0000000..0b4abec
--- /dev/null
+++ b/roles/greenlightv3/tasks/upload_scripte
@@ -0,0 +1,40 @@
+
+- name: Check if greenlight v3 is installed
+ stat: path=/root/greenlight-v3
+ register: glv3installed
+
+- name: Upload backup-script to /root/greenlight-v3
+ copy:
+ src: backup
+ dest: /root/greenlight-v3
+ owner: root
+ group: root
+ mode: 0755
+ when: glv3installed.stat.exists
+
+- name: Upload build-script to /root/greenlight-v3
+ copy:
+ src: build
+ dest: /root/greenlight-v3
+ owner: root
+ group: root
+ mode: 0755
+ when: glv3installed.stat.exists
+
+- name: Upload makeAdmin-script to /root/greenlight-v3
+ copy:
+ src: makeAdmin
+ dest: /root/greenlight-v3
+ owner: root
+ group: root
+ mode: 0755
+ when: glv3installed.stat.exists
+
+- name: Upload postgres-script to /root/greenlight-v3
+ copy:
+ src: postgres
+ dest: /root/greenlight-v3
+ owner: root
+ group: root
+ mode: 0755
+ when: glv3installed.stat.exists