Emperra: user und rechte

diff --git a/common.yaml b/common.yaml
index 4829f0fb41a22ce1179b248a3192e9576f157022..5f9635f637c20d41fe9fb52efcace8b34cc9cc8c 100644 (file)
--- a/common.yaml
+++ b/common.yaml
@@ -513,12 +513,12 @@ accounts::users:
     shell: "bash"
   neumann:
     uid: 60225
-    key: "AAAAB3NzaC1yc2EAAAADAQABAAACAQCthh8D5CX/hDaXvq5aRJOPLjFFC/8V2nLctbY/IfuMlXJ9Xd3mM6JDHiwHzeXCirx3c8TarmbNkKe4R6SWGhtaS5VszItfpe7upH7LpVX2aJPocMlyKCSf2GrKad6PbAQCdCAz+2xtriVuF4RMkOCw/TG0llgKPYavDRkaEWujw8/bO3Sv+oAdhZDoNDnUs0ovWhogoS6EcrjvNRD94d7uUi9KhpZu/tqcOK+jlJdOadGOljP2y2XFqH7Tp6tY0BOr2SlrS5hneStsEEMt8WlWVW3eZk4WVQq2Gd3WGmcS9pyuxdguKhjlNFP+LKLwwiqyW8jkgnsUkv4/Iw/L787w1tUDzl7G1UWxOiC/jT8T2zg8/MEhxRB8rRy4ycCpL13YifyR+anHe9SIhBkj83d2jLtjDfYYDAxvQM3ugugAew2z9fstOGBJHpfsSKtymmWt9hLBnA/ZJoBvboUUpYapcW1h35rez3C5dsilrGHIb2E3ZZM2P1f7TTCWEEOmAS0WfyTdWM0BkKQ1LkTedHGuYRYYimIBti09IfUIn+OZrijo43xJCptlgylRbZZVaFq+0dn9n8qz4GLP6pbG84MjJLQi8zBJbadpXq06RJUOxdJXcxYajRkBCS6RGoItMTgScx3HUkToxskxYg17phjH10rEvx88JoCaTSYFpsHecw=="
-    comment: "Arne Neumann - Emperra test und www"
-  neumann-portal:
-    uid: 60226
-    key: "AAAAB3NzaC1yc2EAAAADAQABAAACAQC4mJlEKNYLEY3CUDT+45vzUmm6sGiq99wDsY3pdpX61WfK8dQnROPgsNSx4DfsSLKbYuNWffBVJyaOWOnNnbLSoeJt55IBmnG/cjsbNm2viOePkm3C4CZ8j/5SLOEAIlqLN+QDPnrcM6yzDc6HsA0b5dbEKi8bkQ2jv6qVvIperJacPHarGtA5P6PTnYcC2kTxgBlVmMR3eNB6pONF45wN5ew5wJnqxaUeh/CF1zI66V1IN/yAdYDH9eik7pXGwDmeMWtAuQoSm9i8HhscR27rgjT1CYp934v9R6y+kq46C+K0W3+97yaI86Uiu0k1iYg/p5FHQxj07WBrlNrZJpDFlR8+7qxa5a0OddJEz6vy3KlccmFeQ5dWVNhrqra0ShubM1+futSj3mHAaFKEFKX4l8+CswSwU6Hlbdd80jWxlvvf6rSTSOGmB96EXlvdmfgrPERHwNWI5ZXDmpqD8oL+ZrZHanLekmPSZHjldzNsWKX3BzsTrOIxNkGGdi5+N64l0hgc53dmThvMtrRNeuq3auUOI51AfWZTBgPE7lhBQJnl1QzDlmboRh1SMGyndU2iyCoo8YSCr1ypXK17GLmSaMQvFsHlPyp3Ts0AXCTaI2lVG9Y0l5+NP/A33hZO6BFwIYf73MhI3Cyhsg4A4T1qvbf3NoPvP7SQC9yyx5k+8w=="
-    comment: "Arne Neumann - Emperra portal live"
+    keys: 
+      emperra:
+        key: "AAAAB3NzaC1yc2EAAAADAQABAAACAQCthh8D5CX/hDaXvq5aRJOPLjFFC/8V2nLctbY/IfuMlXJ9Xd3mM6JDHiwHzeXCirx3c8TarmbNkKe4R6SWGhtaS5VszItfpe7upH7LpVX2aJPocMlyKCSf2GrKad6PbAQCdCAz+2xtriVuF4RMkOCw/TG0llgKPYavDRkaEWujw8/bO3Sv+oAdhZDoNDnUs0ovWhogoS6EcrjvNRD94d7uUi9KhpZu/tqcOK+jlJdOadGOljP2y2XFqH7Tp6tY0BOr2SlrS5hneStsEEMt8WlWVW3eZk4WVQq2Gd3WGmcS9pyuxdguKhjlNFP+LKLwwiqyW8jkgnsUkv4/Iw/L787w1tUDzl7G1UWxOiC/jT8T2zg8/MEhxRB8rRy4ycCpL13YifyR+anHe9SIhBkj83d2jLtjDfYYDAxvQM3ugugAew2z9fstOGBJHpfsSKtymmWt9hLBnA/ZJoBvboUUpYapcW1h35rez3C5dsilrGHIb2E3ZZM2P1f7TTCWEEOmAS0WfyTdWM0BkKQ1LkTedHGuYRYYimIBti09IfUIn+OZrijo43xJCptlgylRbZZVaFq+0dn9n8qz4GLP6pbG84MjJLQi8zBJbadpXq06RJUOxdJXcxYajRkBCS6RGoItMTgScx3HUkToxskxYg17phjH10rEvx88JoCaTSYFpsHecw=="
+      portal:
+        key: "AAAAB3NzaC1yc2EAAAADAQABAAACAQC4mJlEKNYLEY3CUDT+45vzUmm6sGiq99wDsY3pdpX61WfK8dQnROPgsNSx4DfsSLKbYuNWffBVJyaOWOnNnbLSoeJt55IBmnG/cjsbNm2viOePkm3C4CZ8j/5SLOEAIlqLN+QDPnrcM6yzDc6HsA0b5dbEKi8bkQ2jv6qVvIperJacPHarGtA5P6PTnYcC2kTxgBlVmMR3eNB6pONF45wN5ew5wJnqxaUeh/CF1zI66V1IN/yAdYDH9eik7pXGwDmeMWtAuQoSm9i8HhscR27rgjT1CYp934v9R6y+kq46C+K0W3+97yaI86Uiu0k1iYg/p5FHQxj07WBrlNrZJpDFlR8+7qxa5a0OddJEz6vy3KlccmFeQ5dWVNhrqra0ShubM1+futSj3mHAaFKEFKX4l8+CswSwU6Hlbdd80jWxlvvf6rSTSOGmB96EXlvdmfgrPERHwNWI5ZXDmpqD8oL+ZrZHanLekmPSZHjldzNsWKX3BzsTrOIxNkGGdi5+N64l0hgc53dmThvMtrRNeuq3auUOI51AfWZTBgPE7lhBQJnl1QzDlmboRh1SMGyndU2iyCoo8YSCr1ypXK17GLmSaMQvFsHlPyp3Ts0AXCTaI2lVG9Y0l5+NP/A33hZO6BFwIYf73MhI3Cyhsg4A4T1qvbf3NoPvP7SQC9yyx5k+8w=="
+    comment: "Arne Neumann - Emperra"
   dialog:
     uid: 20017
     comment: "DIA.log User - Emperra"

diff --git a/customer/emperra/portal-esysta-com.pixelpark.net.yaml b/customer/emperra/portal-esysta-com.pixelpark.net.yaml
index bd07cd3307c82e763a93e3f02a5c452b5a304823..9c9c66876d3d4862d2c5781b08ebb6cb3de518ad 100644 (file)
--- a/customer/emperra/portal-esysta-com.pixelpark.net.yaml
+++ b/customer/emperra/portal-esysta-com.pixelpark.net.yaml
@@ -36,6 +36,15 @@ accounts::users:
     sudo_cmds:
       - DIALOG
       - APACHE
+  neumann:
+    apply: true
+    sudo: true
+    group: emperra
+    groups:
+      - dialog
+    sudo_cmds:
+      - DIALOG
+      - APACHE
   dialog:
     apply: true
     sudo: true
@@ -44,11 +53,8 @@ accounts::users:
       - emperra
     sudo_cmds:
       - DIALOG
-      - DIALOGNOSSL
       - APACHE
-      - POSTGRES
       - JRNLDIALOG
-      - JRNLDIALOGNOSSL
 
 sudo::configs:
   cmd_alias:
@@ -56,6 +62,7 @@ sudo::configs:
     content: |
       Cmnd_Alias DIALOG = /bin/systemctl * DIAlog.service
       Cmnd_Alias APACHE = /bin/systemctl * httpd.service
+      Cmnd_Alias JRNLDIALOG = /bin/journalctl * DIALOG.service
   runasdialog:
     priority: "06"
     content: |

diff --git a/customer/emperra/test-portal-esysta-com.pixelpark.net.yaml b/customer/emperra/test-portal-esysta-com.pixelpark.net.yaml
index 7005a2a5ab417e8f92a2fb8d3a9e9566789239bb..170006e8066dba02b2a96ee49c58c4a657a0fb63 100644 (file)
--- a/customer/emperra/test-portal-esysta-com.pixelpark.net.yaml
+++ b/customer/emperra/test-portal-esysta-com.pixelpark.net.yaml
@@ -52,6 +52,19 @@ accounts::users:
       - POSTGRES
       - JRNLDIALOG
       - JRNLDIALOGNOSSL
+  neumann:
+    apply: true
+    sudo: true
+    group: emperra
+    groups:
+      - dialog
+    sudo_cmds:
+      - DIALOG
+      - DIALOGNOSSL
+      - APACHE
+      - POSTGRES
+      - JRNLDIALOG
+      - JRNLDIALOGNOSSL
   dialog:
     apply: true
     sudo: true
@@ -87,7 +100,7 @@ sudo::configs:
       Cmnd_Alias DIALOGNOSSL = /bin/systemctl * DIAlogNOSSL.service
       Cmnd_Alias APACHE = /bin/systemctl * httpd.service
       Cmnd_Alias POSTGRES = /bin/systemctl * postgresql.service
-      Cmnd_Alias JRNLDIALOG = /bin/journalctl * postgresql.service
+      Cmnd_Alias JRNLDIALOG = /bin/journalctl * DIAlog.service
       Cmnd_Alias JRNLDIALOGNOSSL = /bin/journalctl * DIAlogNOSSL.service
 
   runasdialog: