fbb accounts

diff --git a/customer/fbb-www/common.yaml b/customer/fbb-www/common.yaml
index bcf33ab958170d7c287448ce9df44c049f95cfd1..daa8715f0226d29694f2487529f8873739b808d0 100644 (file)
--- a/customer/fbb-www/common.yaml
+++ b/customer/fbb-www/common.yaml
@@ -1,39 +1,4 @@
 ---
-accounts::users:
-  web:
-    apply: true
-    sudo: false
-    uid: 60300
-    comment: "Fiona Export"
-    keys:
-      nps55@sxflnx03:
-        key: "AAAAB3NzaC1kc3MAAACBAM55wAuW+mCV7btnCwF8xaacZOPNUkuqzVKkTtfWppqNKaoMGHqBIIvMxRlgSOVGnSX7lg8gRE3K3VRbordT4kMD4y4xhBSyzeSktYX1Wo5krBEAI+qf0R52Sxfx30EUraxgt0uZTjw1aaSLjP9/MiZUCM7UhadRGFJhVUF0GrYLAAAAFQDe18tTX3nwZs6Q2Zn3lqbQ5q6ZLwAAAIEAqNNKt7ZwbaVNEtFiJc4xoXnB1y0M1RcPUps45bMMEz6vNsB1jzEskQoXcEcYwaL4RDj7m6TEzuPrRBnHllQQPspbKxAkzdsRDtb85R+y7ZBg8ygjPy+waGt6sCU2od1SMav5CC9UXH4PAi+b88CaFVvnqARoRM6CcRmLXPMEWBgAAACBAM44mldGOTCFZfzFsefh3QAA/gYwOlhNMJOES5fpSetD0st3OgNkChd5vVYcrnOei7YJKZBy6863WJVWzk4/IPSRuJPGTfl9bJLzVaQPkHHLUlKaaVIhIXoBMgpfbY2SqOjNVEyvTfI0iCqnf4q8ADPDcz93spurKQl7GaV6+Q6r"
-        type: "ssh-dss"
-      Darksite_Admin_Tool:
-        key: "AAAAB3NzaC1kc3MAAACBANtL0m4qOL4mU1h014HAo3Au97ahDgSfWtQFHz6/XMB5TLaOIssPiN7K28/CadZIdj1yC62uxW6MnmgsAfo15c3+GW2p3XJxjWm8a+jefDejUFBUA4mVg0/EvAF0mDVB9t1BtLvGDUWTca3r3N1TPBULDcEpimsaQqeMapMwQ4kxAAAAFQDxShJd9+FfgaG5KemaYSBQiPzvdwAAAIBDnZYxz9CxKXvl0fEmoVWa7aMoQdWtaNtu59kT+zsuEa68asE14gAeR9dl4ctqQuXBsy8/fyK/9heZDROFi6AV5R7AeLc/eXOT7m5T0CQNDoBoyK63p/S38BQ8YR8Q6RfO9E2D5XbWjDvI8YG44VnuTNO2wKt+n34qRblhuAh6gQAAAIAJ/tbzg+xynMx5jqigcp3+oFKSGYJZidlw7t6q5LOgQLhSkEB+Xo9YH6y7JlsWVlYUTeYVGDH+EGs7/Q2XD80LSB7mbQRNRiFeyQ7+kxMa/fcHgS0Kj7MTEC/qPvuOxRmyMnuoJafl/KCdPuiS8VcsuOTjgC39QMLUMsBDwKgd/g=="
-        type: "ssh-dss"
-      darksite_xfer:
-        key: "AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLQgXatMS7km7uYWyrXHxQxwwoK9jEoYEAAEp0xIGtuIe6IFy0Xn7Adi6SxhThvySaKGKfQnvJBL3LBMSqRbjEc="
-        type: "ecdsa-sha2-nistp256"
-  flugdat:
-    apply: true
-    sudo: false
-    uid: 60301
-    comment: "Flugdaten Export"
-    keys:
-      sxf110_install:
-        key: "AAAAB3NzaC1kc3MAAACBAPr94iKqYsRMUlxhq3TGkjC3wVk64kPw3CD7+0787u1K/s5hUqB43lf6CsKgT9+X766qYyJ33Eu2dq0wlesL3anHKeVzdZRgVdPmCYoggf0L1KdmkUjzZunnVol0P6EelCKmnaY3QBoZpD2tGKx9SMVjm1FzB+PZs8GGEGP1v/+DAAAAFQCZMvxEf4BRfevcMnr4g4IinXwHHwAAAIBbq0cSupbp0rdT7If8+YFfMkPQsPW4rjqS7i6pfRpsuRyDB70QpCV1w46HJh0pBqW/kxNVos9fKLNGJGLNdXxlxEQe3xvrBPxfwXK+Qqp7uNlGEpIGAufBsFHxi+SHqAFGjz4tzG4Nco5Vtc3uyoq0gdElBh/cjAQRZ/j0yK+kTgAAAIEA5oEizu5/DWy8hKOb6x56ZAtzafYwcwry0UkTyRLUOTT5I3SGiddgFhnZpEFpsRBYnQjeZ461sElMlxzHAqrRb0lRdSCIhLguLWBkJzK2V1k5TjVtH96WFPzoTPD8SYFCc+SlfjwL46Y0JCSZSp8nn9GvSo7Is7KppIijkVzig+o="
-        type: "ssh-dss"
-      fids@sxffis:
-        key: "AAAAB3NzaC1yc2EAAAABIwAAAQEA2NL0M5djqWepHW7jrUxk6BbweNbjk8U2mJuPv1pghvZqp7MSBjrv+96Fzo0dI0gX8NdNe8c+WsI1kgsGf7uz2UrhoYiypmADLcULtNMQEPmuX3cmsR0m88Q2cH6lwZ4R2ydhX7+lMdn3uha2+qdwSfRBOHyPSxZF52YIEE9cNAn4ZNLaO6UGV5QIGktHQ13UdDIGUodanX/XOUKXPFNkFOQN7/X7CptKEK374gSGFppYw+7vmvg7KNTblWQLZvJAiPOZBQV93kJnx9XCvxCJSonZ50UH337x32LF5CnzGp4tbkj4IachiaEEjySzLIv8zlOaSEsDxlU0aKEW3l0ERw=="
-        type: "ssh-dss"
-  presse:
-    apply: true
-    sudo: false
-    uid: 60302
-    comment: "Presse Uploads"
-    key: "AAAAB3NzaC1yc2EAAAABJQAAAgEA1JtW/uakIVdZJ2GbwaxlpASVrv64bJM557pByFZyrb9ROlDNl7leoP9ViY3g8f10yspNewG0f3TMxy6wpKj89C9STmOoPFYchqmlqQUaypQBMvggMe/XN4N0IZc98XGvLZ2s2o55rSbjLuHTfoV2aDoPGzhyFa7av08YtmQIc4Dq8Wd84WE7bGBjbfwYE+O7y876l4Q3rFL5x+ceQ1kr0Zpqk1dF8T/sY+QoAWQP48hMjp5zC2wZ7T0jdI3aslxqC7Gnc+9mefWGW7Y/DHlkDUrGzf5mO9kMpOE+nhrEumNWmSLOLN8YE5hnPRdy4PVjjUCJsC9sW2VBXLamj6IT+2T4JpChLG/m07ki84SWfYNS6o3opKFmugKMtxJtQxiWgdTRyTpVokX7G3x4k3WTG6FAkJyMIC10eYGeuEell8LabyHfGS1DehVFkZtDgqfgYPp3p+mr2NlmqgHWdBmAvTcbpjEdA02xpYjM/qNVPsRA3JHBuj3S6r7nL7zr03zfBgt9VF4+y8lJMwIPAtV1osQdTzkJLBIcOfKL3j2edozQCOhoY1T/IhaS83iHl3r4ZlxViI/Eo0QTliqgfN4PtVMTlgyjHdqqTI+JXccJqhfZs+gmynWJrek4pmlOUjaL3y9is6bdlgW8qU44gvaUPJyxVA3/vofkqoQkxI3/E00="
-
 #####################################################
 # Postfix configuration:
 

diff --git a/customer/fbb-www/dev-www-fbb.pixelpark.net.yaml b/customer/fbb-www/dev-www-fbb.pixelpark.net.yaml
index 5571dedd0f7a0832d432576b5f9ca81f638508cf..115097edd4bf273b7e760f12520161e37a785d83 100644 (file)
--- a/customer/fbb-www/dev-www-fbb.pixelpark.net.yaml
+++ b/customer/fbb-www/dev-www-fbb.pixelpark.net.yaml
@@ -11,6 +11,66 @@ accounts::users:
   jenkins:
     apply: true
     sudo: false
+  web:
+    apply: true
+    sudo: false
+    uid: 60300
+    group: "fiona"
+    comment: "Fiona Export"
+    keys:
+      nps55@sxflnx03:
+        key: "AAAAB3NzaC1kc3MAAACBAM55wAuW+mCV7btnCwF8xaacZOPNUkuqzVKkTtfWppqNKaoMGHqBIIvMxRlgSOVGnSX7lg8gRE3K3VRbordT4kMD4y4xhBSyzeSktYX1Wo5krBEAI+qf0R52Sxfx30EUraxgt0uZTjw1aaSLjP9/MiZUCM7UhadRGFJhVUF0GrYLAAAAFQDe18tTX3nwZs6Q2Zn3lqbQ5q6ZLwAAAIEAqNNKt7ZwbaVNEtFiJc4xoXnB1y0M1RcPUps45bMMEz6vNsB1jzEskQoXcEcYwaL4RDj7m6TEzuPrRBnHllQQPspbKxAkzdsRDtb85R+y7ZBg8ygjPy+waGt6sCU2od1SMav5CC9UXH4PAi+b88CaFVvnqARoRM6CcRmLXPMEWBgAAACBAM44mldGOTCFZfzFsefh3QAA/gYwOlhNMJOES5fpSetD0st3OgNkChd5vVYcrnOei7YJKZBy6863WJVWzk4/IPSRuJPGTfl9bJLzVaQPkHHLUlKaaVIhIXoBMgpfbY2SqOjNVEyvTfI0iCqnf4q8ADPDcz93spurKQl7GaV6+Q6r"
+        type: "ssh-dss"
+      Darksite_Admin_Tool:
+        key: "AAAAB3NzaC1kc3MAAACBANtL0m4qOL4mU1h014HAo3Au97ahDgSfWtQFHz6/XMB5TLaOIssPiN7K28/CadZIdj1yC62uxW6MnmgsAfo15c3+GW2p3XJxjWm8a+jefDejUFBUA4mVg0/EvAF0mDVB9t1BtLvGDUWTca3r3N1TPBULDcEpimsaQqeMapMwQ4kxAAAAFQDxShJd9+FfgaG5KemaYSBQiPzvdwAAAIBDnZYxz9CxKXvl0fEmoVWa7aMoQdWtaNtu59kT+zsuEa68asE14gAeR9dl4ctqQuXBsy8/fyK/9heZDROFi6AV5R7AeLc/eXOT7m5T0CQNDoBoyK63p/S38BQ8YR8Q6RfO9E2D5XbWjDvI8YG44VnuTNO2wKt+n34qRblhuAh6gQAAAIAJ/tbzg+xynMx5jqigcp3+oFKSGYJZidlw7t6q5LOgQLhSkEB+Xo9YH6y7JlsWVlYUTeYVGDH+EGs7/Q2XD80LSB7mbQRNRiFeyQ7+kxMa/fcHgS0Kj7MTEC/qPvuOxRmyMnuoJafl/KCdPuiS8VcsuOTjgC39QMLUMsBDwKgd/g=="
+        type: "ssh-dss"
+      darksite_xfer:
+        key: "AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLQgXatMS7km7uYWyrXHxQxwwoK9jEoYEAAEp0xIGtuIe6IFy0Xn7Adi6SxhThvySaKGKfQnvJBL3LBMSqRbjEc="
+        type: "ecdsa-sha2-nistp256"
+  flugdat:
+    apply: true
+    sudo: false
+    uid: 60301
+    comment: "Flugdaten Import"
+    keys:
+      sxf110_install:
+        key: "AAAAB3NzaC1kc3MAAACBAPr94iKqYsRMUlxhq3TGkjC3wVk64kPw3CD7+0787u1K/s5hUqB43lf6CsKgT9+X766qYyJ33Eu2dq0wlesL3anHKeVzdZRgVdPmCYoggf0L1KdmkUjzZunnVol0P6EelCKmnaY3QBoZpD2tGKx9SMVjm1FzB+PZs8GGEGP1v/+DAAAAFQCZMvxEf4BRfevcMnr4g4IinXwHHwAAAIBbq0cSupbp0rdT7If8+YFfMkPQsPW4rjqS7i6pfRpsuRyDB70QpCV1w46HJh0pBqW/kxNVos9fKLNGJGLNdXxlxEQe3xvrBPxfwXK+Qqp7uNlGEpIGAufBsFHxi+SHqAFGjz4tzG4Nco5Vtc3uyoq0gdElBh/cjAQRZ/j0yK+kTgAAAIEA5oEizu5/DWy8hKOb6x56ZAtzafYwcwry0UkTyRLUOTT5I3SGiddgFhnZpEFpsRBYnQjeZ461sElMlxzHAqrRb0lRdSCIhLguLWBkJzK2V1k5TjVtH96WFPzoTPD8SYFCc+SlfjwL46Y0JCSZSp8nn9GvSo7Is7KppIijkVzig+o="
+        type: "ssh-dss"
+      fids@sxffis:
+        key: "AAAAB3NzaC1yc2EAAAABIwAAAQEA2NL0M5djqWepHW7jrUxk6BbweNbjk8U2mJuPv1pghvZqp7MSBjrv+96Fzo0dI0gX8NdNe8c+WsI1kgsGf7uz2UrhoYiypmADLcULtNMQEPmuX3cmsR0m88Q2cH6lwZ4R2ydhX7+lMdn3uha2+qdwSfRBOHyPSxZF52YIEE9cNAn4ZNLaO6UGV5QIGktHQ13UdDIGUodanX/XOUKXPFNkFOQN7/X7CptKEK374gSGFppYw+7vmvg7KNTblWQLZvJAiPOZBQV93kJnx9XCvxCJSonZ50UH337x32LF5CnzGp4tbkj4IachiaEEjySzLIv8zlOaSEsDxlU0aKEW3l0ERw=="
+        type: "ssh-dss"
+  presse:
+    apply: true
+    sudo: false
+    uid: 60302
+    comment: "Presse Uploads"
+    key: "AAAAB3NzaC1yc2EAAAABJQAAAgEA1JtW/uakIVdZJ2GbwaxlpASVrv64bJM557pByFZyrb9ROlDNl7leoP9ViY3g8f10yspNewG0f3TMxy6wpKj89C9STmOoPFYchqmlqQUaypQBMvggMe/XN4N0IZc98XGvLZ2s2o55rSbjLuHTfoV2aDoPGzhyFa7av08YtmQIc4Dq8Wd84WE7bGBjbfwYE+O7y876l4Q3rFL5x+ceQ1kr0Zpqk1dF8T/sY+QoAWQP48hMjp5zC2wZ7T0jdI3aslxqC7Gnc+9mefWGW7Y/DHlkDUrGzf5mO9kMpOE+nhrEumNWmSLOLN8YE5hnPRdy4PVjjUCJsC9sW2VBXLamj6IT+2T4JpChLG/m07ki84SWfYNS6o3opKFmugKMtxJtQxiWgdTRyTpVokX7G3x4k3WTG6FAkJyMIC10eYGeuEell8LabyHfGS1DehVFkZtDgqfgYPp3p+mr2NlmqgHWdBmAvTcbpjEdA02xpYjM/qNVPsRA3JHBuj3S6r7nL7zr03zfBgt9VF4+y8lJMwIPAtV1osQdTzkJLBIcOfKL3j2edozQCOhoY1T/IhaS83iHl3r4ZlxViI/Eo0QTliqgfN4PtVMTlgyjHdqqTI+JXccJqhfZs+gmynWJrek4pmlOUjaL3y9is6bdlgW8qU44gvaUPJyxVA3/vofkqoQkxI3/E00="
+  db.export:
+    apply: true
+    sudo: false
+    uid: 60302
+    group: "db.export"
+    comment: "DB Export für FBB CMS"
+
+infra::additional_files:
+  fiona:
+    owner: apache
+    group: fiona
+    mode: '2770'
+    ensure: 'directory'
+    path: '/var/data/fiona'
+  darksite:
+    owner: apache
+    group: darksite
+    mode: '2770'
+    ensure: 'directory'
+    path: '/var/data/darksite'
+  db.export:
+    owner: apache
+    group: db.export
+    mode: '0770'
+    ensure: file
+    path: '/opt/app/web_alt/flugplan_dbsync/flugplan_alt.sql'
 
 sudo::configs:
   jenkins_rights: