X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=vm_hosted;h=0514a43b62413090ff24b0caa73b213e4f243736;hb=95955dc2c60de318b36d09e22494c7841fbc6f1a;hp=a630d12bb2da04a9673350fadc732046d2da9838;hpb=c6358beea0be57737b6a6980657b7b5744e51774;p=lhc%2Fateliers.git

diff --git a/vm_hosted b/vm_hosted
index a630d12..0514a43 100755
--- a/vm_hosted
+++ b/vm_hosted
@@ -313,6 +313,25 @@ rule__boot_init () {
 	sudo update-grub2 # NOTE: prend en compte /boot/grub/device.map
 	rule__initramfs_init
  }
+rule_apticron_init () {
+	sudo apt-get install --reinstall apticron
+	mk_reg mod=644 own=root:root /etc/default/grub <<-EOF
+		EMAIL="admin@heureux-cyclage.org"
+		# DIFF_ONLY="1"
+		# LISTCHANGES_PROFILE="apticron"
+		# ALL_FQDNS="1"
+		# SYSTEM="foobar.example.com"
+		# IPADDRESSNUM="1"
+		# IPADDRESSES="192.0.2.1 2001:db8:1:2:3::1"
+		# NOTIFY_HOLDS="0"
+		# NOTIFY_NEW="0"
+		# NOTIFY_NO_UPDATES="0"
+		# CUSTOM_SUBJECT=""
+		# CUSTOM_NO_UPDATES_SUBJECT=""
+		# CUSTOM_FROM="root@ateliers.heureux-cyclage.org"
+		EOF
+	sudo service apticron restart
+ }
 rule__bin_init () {
 	mk_lnk "$tool"/vm_hosted /usr/local/sbin/
  }
@@ -428,8 +447,8 @@ rule_user_admin_add () { # SYNTAX: $user
 	 <"$tool"/var/pub/ssh/"$user".key
 	rule__initramfs_init
 	rule__user_root_init
-	sudo gpg --import "$tool"/var/pub/opengpg/"$user".key
-	    # TODO: importer toutes les clefs des utilisateurices
+	sudo -u "$user" find "$tool"/var/pub/openpgp \
+	 -type f -name '*.key' -exec gpg --import {} \;
  }
 rule_user_mail_format () {
 	mk_dir mod=770 own=root:adm /etc/skel/etc/procmail