From 135dd5935139bd9a072ae5073779ab5488ecbeb6 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Sun, 7 Apr 2013 03:09:05 +0200 Subject: [PATCH] Ajout : etc/user.d/ . --- etc/user.d/cyclo_paris_est/configure.sh | 2 ++ etc/user.d/lhc/configure.sh | 2 ++ etc/user.d/ptitvelo/configure.sh | 2 ++ etc/user.d/velorution_idf/configure.sh | 2 ++ etc/user.d/velosenville/configure.sh | 2 ++ var/pub/ssh/{hc.key => cyclo_paris_est.key} | 0 var/pub/ssh/lhc.key | 2 ++ var/pub/ssh/ptitvelo.key | 2 ++ var/pub/ssh/velorution_idf.key | 2 ++ var/pub/ssh/velosenville.key | 2 ++ vm_hosted | 17 ++++++++++++----- 11 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 etc/user.d/cyclo_paris_est/configure.sh create mode 100644 etc/user.d/lhc/configure.sh create mode 100644 etc/user.d/ptitvelo/configure.sh create mode 100644 etc/user.d/velorution_idf/configure.sh create mode 100644 etc/user.d/velosenville/configure.sh rename var/pub/ssh/{hc.key => cyclo_paris_est.key} (100%) create mode 100644 var/pub/ssh/lhc.key create mode 100644 var/pub/ssh/ptitvelo.key create mode 100644 var/pub/ssh/velorution_idf.key create mode 100644 var/pub/ssh/velosenville.key diff --git a/etc/user.d/cyclo_paris_est/configure.sh b/etc/user.d/cyclo_paris_est/configure.sh new file mode 100644 index 0000000..154c594 --- /dev/null +++ b/etc/user.d/cyclo_paris_est/configure.sh @@ -0,0 +1,2 @@ +rule user_add "$user" \ + --gecos "Cyclofficine de Paris Est,,,,contact@cyclocoop.org" \ diff --git a/etc/user.d/lhc/configure.sh b/etc/user.d/lhc/configure.sh new file mode 100644 index 0000000..ef66a7f --- /dev/null +++ b/etc/user.d/lhc/configure.sh @@ -0,0 +1,2 @@ +rule user_add "$user" \ + --gecos "Heureux Cyclage,,,,contact@heureux-cyclage.org" diff --git a/etc/user.d/ptitvelo/configure.sh b/etc/user.d/ptitvelo/configure.sh new file mode 100644 index 0000000..63ab0af --- /dev/null +++ b/etc/user.d/ptitvelo/configure.sh @@ -0,0 +1,2 @@ +rule user_add "$user" \ + --gecos "uN p’Tit véLo dAnS La Tête,,,,contact@ptitvelo.net" diff --git a/etc/user.d/velorution_idf/configure.sh b/etc/user.d/velorution_idf/configure.sh new file mode 100644 index 0000000..5540e77 --- /dev/null +++ b/etc/user.d/velorution_idf/configure.sh @@ -0,0 +1,2 @@ +rule user_add "$user" \ + --gecos "Vélorution Île-de-France,,,,contact@velorution.org" diff --git a/etc/user.d/velosenville/configure.sh b/etc/user.d/velosenville/configure.sh new file mode 100644 index 0000000..750b671 --- /dev/null +++ b/etc/user.d/velosenville/configure.sh @@ -0,0 +1,2 @@ +rule user_add "$user" \ + --gecos "Comité Vélos en Ville Marseille,,,,contact@velosenville.org" diff --git a/var/pub/ssh/hc.key b/var/pub/ssh/cyclo_paris_est.key similarity index 100% rename from var/pub/ssh/hc.key rename to var/pub/ssh/cyclo_paris_est.key diff --git a/var/pub/ssh/lhc.key b/var/pub/ssh/lhc.key new file mode 100644 index 0000000..042738c --- /dev/null +++ b/var/pub/ssh/lhc.key @@ -0,0 +1,2 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQD5FtR++UPEg/5wFeyb2JSS09idTaDb4tMIRf1yxCsyIJEp5LQMif/fIptDeHoYc55lwy8vnWWN9PJpb6PS8YSaLLFV5tn8esR8Ml+evNCAD52Tdu1kPRXGLCSF5kSVnbAMoxqiNi8vRRKXwAzGgXmIUzDAE4QTsq3EwZM6cBnDx5O79wBIZ9va2TObL52qv+Vpi+QyINuslKKc+Osu92pdwceIGZUcwA6Y8aH6lavaTyDUQdSjMRMTAiXSPRjmHf1q+V7wENXT/TKXuuahN8NnJShX3Qf9hwNEIU46SOENsrRFQ5eYahAmqUIK4GbsERS2KRDxbvSOl7rKh2sauBxyKfkW/gxQ4LAyywxuumpI0pO7XmdINCGWdXS9gD216lcGuH/TC0KboiOVExh65eRIOeEFTec0VJQEqqnFul7u8YNPmbBpLnM+SQ3TAkdQmfasKgPIazFNCAnC8I9hKlGYpLk/Dgi/sVbwFeoOUQcaTBRnWKUCedX4v4kmPIHuHSNPV2C/0770gH2iJ1N1XEO3YDGiixuHHiLlCV8Ko950CoTh1PwDNCd3Qy/jR/QhE2waVPliFwl2+H6IkIxkUO8A9ktLCJUeaZJN3snoV+9hvpT1E2TrEccsTVx5BaGAJCUkvO2XYlEsNceIIitkrbhidjZvfZ4/czGUKoN1wSSpMw== OpenPGP pub=F2E027182397AC0775714F2AD15AF7F467E8299B sub=7819E44BAEEDE91683811BB00E1AAADBE227DDAA Julien Moutinho +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCVwNXa4VtqTx56gRMFaClp5k0jTdu0lXC9uaNsraV+tgcFGb4ZTX3/6lS2zqUuoIoluo0rhDcV64Nh2DtDg/6b12qRRJl6vIctfYGVxRapM/ykA6dqzdXyGMBh+h9SP+LIAmZWKQLThg5q5x6uiFXTEW3SStWefizRuvRatkRHOwamSk5M1dCHxkfLgZj6Huq6ni/WyOvQH/es4rrERpPxtbvnQNphJIBXMOyLzhPJd8HHWcx1Hf7vGeh7FUyMR+qyA+xdB8TW5ZT8WsDGray+sGkdCflkAsfbjRSykOAoR59LoyDeRcQwCS1bxU4JuMC2Sv7+XONzfjBo39SOTBlDlK/LAvsAOFzVilx1WQxHI6iq5po+HXL05tCeHZBwucwYcxvNZX+7L5G7Qk4mz+8wUonusEAEDUulmo+OdxFh0iXOjQD8yZ3yJFYEPfaqy8BSYKp5eJmomiWNl3UKT90Dy0kdEOTvO2sgEYGdueypol2NlAc98J9tjSyS2nQlEdya+PTaz6pMKKLwVgqG+f4najYX81P/seC2R6nd4hx47PMzBs+00sCdr9UtmOyuGniZ8b4o5JVUyfwynLx2DDtliwrNBoJj/6NLJOWB9Rc76ZhGbW82eHNU2bojhqBQh9A024QpWDcAUTEbIpXnt7sTvA15CuGLw1U+Cp+oMAn6RQ== OpenPGP pub=471463744CFC2D97F72D89BBBBBE759DE39FAB83 sub=4CBF71758ED48EC764DA0B4935B9F9C0C4222ECA Ludovic CHEVALIER diff --git a/var/pub/ssh/ptitvelo.key b/var/pub/ssh/ptitvelo.key new file mode 100644 index 0000000..042738c --- /dev/null +++ b/var/pub/ssh/ptitvelo.key @@ -0,0 +1,2 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQD5FtR++UPEg/5wFeyb2JSS09idTaDb4tMIRf1yxCsyIJEp5LQMif/fIptDeHoYc55lwy8vnWWN9PJpb6PS8YSaLLFV5tn8esR8Ml+evNCAD52Tdu1kPRXGLCSF5kSVnbAMoxqiNi8vRRKXwAzGgXmIUzDAE4QTsq3EwZM6cBnDx5O79wBIZ9va2TObL52qv+Vpi+QyINuslKKc+Osu92pdwceIGZUcwA6Y8aH6lavaTyDUQdSjMRMTAiXSPRjmHf1q+V7wENXT/TKXuuahN8NnJShX3Qf9hwNEIU46SOENsrRFQ5eYahAmqUIK4GbsERS2KRDxbvSOl7rKh2sauBxyKfkW/gxQ4LAyywxuumpI0pO7XmdINCGWdXS9gD216lcGuH/TC0KboiOVExh65eRIOeEFTec0VJQEqqnFul7u8YNPmbBpLnM+SQ3TAkdQmfasKgPIazFNCAnC8I9hKlGYpLk/Dgi/sVbwFeoOUQcaTBRnWKUCedX4v4kmPIHuHSNPV2C/0770gH2iJ1N1XEO3YDGiixuHHiLlCV8Ko950CoTh1PwDNCd3Qy/jR/QhE2waVPliFwl2+H6IkIxkUO8A9ktLCJUeaZJN3snoV+9hvpT1E2TrEccsTVx5BaGAJCUkvO2XYlEsNceIIitkrbhidjZvfZ4/czGUKoN1wSSpMw== OpenPGP pub=F2E027182397AC0775714F2AD15AF7F467E8299B sub=7819E44BAEEDE91683811BB00E1AAADBE227DDAA Julien Moutinho +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCVwNXa4VtqTx56gRMFaClp5k0jTdu0lXC9uaNsraV+tgcFGb4ZTX3/6lS2zqUuoIoluo0rhDcV64Nh2DtDg/6b12qRRJl6vIctfYGVxRapM/ykA6dqzdXyGMBh+h9SP+LIAmZWKQLThg5q5x6uiFXTEW3SStWefizRuvRatkRHOwamSk5M1dCHxkfLgZj6Huq6ni/WyOvQH/es4rrERpPxtbvnQNphJIBXMOyLzhPJd8HHWcx1Hf7vGeh7FUyMR+qyA+xdB8TW5ZT8WsDGray+sGkdCflkAsfbjRSykOAoR59LoyDeRcQwCS1bxU4JuMC2Sv7+XONzfjBo39SOTBlDlK/LAvsAOFzVilx1WQxHI6iq5po+HXL05tCeHZBwucwYcxvNZX+7L5G7Qk4mz+8wUonusEAEDUulmo+OdxFh0iXOjQD8yZ3yJFYEPfaqy8BSYKp5eJmomiWNl3UKT90Dy0kdEOTvO2sgEYGdueypol2NlAc98J9tjSyS2nQlEdya+PTaz6pMKKLwVgqG+f4najYX81P/seC2R6nd4hx47PMzBs+00sCdr9UtmOyuGniZ8b4o5JVUyfwynLx2DDtliwrNBoJj/6NLJOWB9Rc76ZhGbW82eHNU2bojhqBQh9A024QpWDcAUTEbIpXnt7sTvA15CuGLw1U+Cp+oMAn6RQ== OpenPGP pub=471463744CFC2D97F72D89BBBBBE759DE39FAB83 sub=4CBF71758ED48EC764DA0B4935B9F9C0C4222ECA Ludovic CHEVALIER diff --git a/var/pub/ssh/velorution_idf.key b/var/pub/ssh/velorution_idf.key new file mode 100644 index 0000000..042738c --- /dev/null +++ b/var/pub/ssh/velorution_idf.key @@ -0,0 +1,2 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQD5FtR++UPEg/5wFeyb2JSS09idTaDb4tMIRf1yxCsyIJEp5LQMif/fIptDeHoYc55lwy8vnWWN9PJpb6PS8YSaLLFV5tn8esR8Ml+evNCAD52Tdu1kPRXGLCSF5kSVnbAMoxqiNi8vRRKXwAzGgXmIUzDAE4QTsq3EwZM6cBnDx5O79wBIZ9va2TObL52qv+Vpi+QyINuslKKc+Osu92pdwceIGZUcwA6Y8aH6lavaTyDUQdSjMRMTAiXSPRjmHf1q+V7wENXT/TKXuuahN8NnJShX3Qf9hwNEIU46SOENsrRFQ5eYahAmqUIK4GbsERS2KRDxbvSOl7rKh2sauBxyKfkW/gxQ4LAyywxuumpI0pO7XmdINCGWdXS9gD216lcGuH/TC0KboiOVExh65eRIOeEFTec0VJQEqqnFul7u8YNPmbBpLnM+SQ3TAkdQmfasKgPIazFNCAnC8I9hKlGYpLk/Dgi/sVbwFeoOUQcaTBRnWKUCedX4v4kmPIHuHSNPV2C/0770gH2iJ1N1XEO3YDGiixuHHiLlCV8Ko950CoTh1PwDNCd3Qy/jR/QhE2waVPliFwl2+H6IkIxkUO8A9ktLCJUeaZJN3snoV+9hvpT1E2TrEccsTVx5BaGAJCUkvO2XYlEsNceIIitkrbhidjZvfZ4/czGUKoN1wSSpMw== OpenPGP pub=F2E027182397AC0775714F2AD15AF7F467E8299B sub=7819E44BAEEDE91683811BB00E1AAADBE227DDAA Julien Moutinho +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCVwNXa4VtqTx56gRMFaClp5k0jTdu0lXC9uaNsraV+tgcFGb4ZTX3/6lS2zqUuoIoluo0rhDcV64Nh2DtDg/6b12qRRJl6vIctfYGVxRapM/ykA6dqzdXyGMBh+h9SP+LIAmZWKQLThg5q5x6uiFXTEW3SStWefizRuvRatkRHOwamSk5M1dCHxkfLgZj6Huq6ni/WyOvQH/es4rrERpPxtbvnQNphJIBXMOyLzhPJd8HHWcx1Hf7vGeh7FUyMR+qyA+xdB8TW5ZT8WsDGray+sGkdCflkAsfbjRSykOAoR59LoyDeRcQwCS1bxU4JuMC2Sv7+XONzfjBo39SOTBlDlK/LAvsAOFzVilx1WQxHI6iq5po+HXL05tCeHZBwucwYcxvNZX+7L5G7Qk4mz+8wUonusEAEDUulmo+OdxFh0iXOjQD8yZ3yJFYEPfaqy8BSYKp5eJmomiWNl3UKT90Dy0kdEOTvO2sgEYGdueypol2NlAc98J9tjSyS2nQlEdya+PTaz6pMKKLwVgqG+f4najYX81P/seC2R6nd4hx47PMzBs+00sCdr9UtmOyuGniZ8b4o5JVUyfwynLx2DDtliwrNBoJj/6NLJOWB9Rc76ZhGbW82eHNU2bojhqBQh9A024QpWDcAUTEbIpXnt7sTvA15CuGLw1U+Cp+oMAn6RQ== OpenPGP pub=471463744CFC2D97F72D89BBBBBE759DE39FAB83 sub=4CBF71758ED48EC764DA0B4935B9F9C0C4222ECA Ludovic CHEVALIER diff --git a/var/pub/ssh/velosenville.key b/var/pub/ssh/velosenville.key new file mode 100644 index 0000000..042738c --- /dev/null +++ b/var/pub/ssh/velosenville.key @@ -0,0 +1,2 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQD5FtR++UPEg/5wFeyb2JSS09idTaDb4tMIRf1yxCsyIJEp5LQMif/fIptDeHoYc55lwy8vnWWN9PJpb6PS8YSaLLFV5tn8esR8Ml+evNCAD52Tdu1kPRXGLCSF5kSVnbAMoxqiNi8vRRKXwAzGgXmIUzDAE4QTsq3EwZM6cBnDx5O79wBIZ9va2TObL52qv+Vpi+QyINuslKKc+Osu92pdwceIGZUcwA6Y8aH6lavaTyDUQdSjMRMTAiXSPRjmHf1q+V7wENXT/TKXuuahN8NnJShX3Qf9hwNEIU46SOENsrRFQ5eYahAmqUIK4GbsERS2KRDxbvSOl7rKh2sauBxyKfkW/gxQ4LAyywxuumpI0pO7XmdINCGWdXS9gD216lcGuH/TC0KboiOVExh65eRIOeEFTec0VJQEqqnFul7u8YNPmbBpLnM+SQ3TAkdQmfasKgPIazFNCAnC8I9hKlGYpLk/Dgi/sVbwFeoOUQcaTBRnWKUCedX4v4kmPIHuHSNPV2C/0770gH2iJ1N1XEO3YDGiixuHHiLlCV8Ko950CoTh1PwDNCd3Qy/jR/QhE2waVPliFwl2+H6IkIxkUO8A9ktLCJUeaZJN3snoV+9hvpT1E2TrEccsTVx5BaGAJCUkvO2XYlEsNceIIitkrbhidjZvfZ4/czGUKoN1wSSpMw== OpenPGP pub=F2E027182397AC0775714F2AD15AF7F467E8299B sub=7819E44BAEEDE91683811BB00E1AAADBE227DDAA Julien Moutinho +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCVwNXa4VtqTx56gRMFaClp5k0jTdu0lXC9uaNsraV+tgcFGb4ZTX3/6lS2zqUuoIoluo0rhDcV64Nh2DtDg/6b12qRRJl6vIctfYGVxRapM/ykA6dqzdXyGMBh+h9SP+LIAmZWKQLThg5q5x6uiFXTEW3SStWefizRuvRatkRHOwamSk5M1dCHxkfLgZj6Huq6ni/WyOvQH/es4rrERpPxtbvnQNphJIBXMOyLzhPJd8HHWcx1Hf7vGeh7FUyMR+qyA+xdB8TW5ZT8WsDGray+sGkdCflkAsfbjRSykOAoR59LoyDeRcQwCS1bxU4JuMC2Sv7+XONzfjBo39SOTBlDlK/LAvsAOFzVilx1WQxHI6iq5po+HXL05tCeHZBwucwYcxvNZX+7L5G7Qk4mz+8wUonusEAEDUulmo+OdxFh0iXOjQD8yZ3yJFYEPfaqy8BSYKp5eJmomiWNl3UKT90Dy0kdEOTvO2sgEYGdueypol2NlAc98J9tjSyS2nQlEdya+PTaz6pMKKLwVgqG+f4najYX81P/seC2R6nd4hx47PMzBs+00sCdr9UtmOyuGniZ8b4o5JVUyfwynLx2DDtliwrNBoJj/6NLJOWB9Rc76ZhGbW82eHNU2bojhqBQh9A024QpWDcAUTEbIpXnt7sTvA15CuGLw1U+Cp+oMAn6RQ== OpenPGP pub=471463744CFC2D97F72D89BBBBBE759DE39FAB83 sub=4CBF71758ED48EC764DA0B4935B9F9C0C4222ECA Ludovic CHEVALIER diff --git a/vm_hosted b/vm_hosted index c019315..f80192c 100755 --- a/vm_hosted +++ b/vm_hosted @@ -1462,13 +1462,12 @@ rule_unbound_configure () { sudo service unbound restart } rule_user_add () { # SYNTAX: $user - rule user_configure - local user=$1 - rule adduser "$user" --disabled-password + local user="$1"; shift + rule adduser "$user" --disabled-password "$@" # NOTE: le mot-de-passe doit être initialisé par l'utilisateur à l'aide de passwd-init . eval local home\; home="~$user" sudo adduser "$user" users - sudo install -m 640 -o root -g root \ + sudo install -m 640 -o "$user" -g "$user" \ "$tool"/var/pub/ssh/"$user".key \ "$home"/etc/ssh/authorized_keys local key; local -; set +f @@ -1496,7 +1495,9 @@ rule_user_configure () { LAST_UID=29999 LETTERHOMES=no NAME_REGEX="^[a-z][-a-z0-9_]*\$" - QUOTAUSER="" # TODO: init + QUOTAUSER="" + # TODO: configure a template user (with edquota or setquota) + # and indicate their user name in the QUOTAUSER variable. SETGID_HOME=no SKEL=/etc/skel SKEL_IGNORE_REGEX="dpkg-(old|new|dist|save)" @@ -1545,6 +1546,12 @@ rule_user_configure () { sudo install -m 644 -o root -g root \ "$tool"/etc/screenrc \ /etc/screenrc + local sh; local -; set +f + for sh in "$tool"/etc/user.d/*/configure.sh + do sh=${sh#"$tool"/etc/user.d/} + local user="${sh%/configure.sh}" + . "$tool"/etc/user.d/"$sh" + done } rule_user_admin_add () { # SYNTAX: $user rule user_configure -- 2.20.1