diff --git a/conf/fusioninventory.conf b/conf/fusioninventory.conf new file mode 100644 index 0000000..ecedca7 --- /dev/null +++ b/conf/fusioninventory.conf @@ -0,0 +1,4 @@ +FI_SERVER="https://agent.dg.acaqb.net/" +FI_PROXY_USER="agent" +FI_PROXY_PASS="kE9TDtP63xwK" +FI_CONF_FILE="/etc/fusioninventory/agent.cfg" diff --git a/files/apt/60-libreoffice b/files/apt/60-libreoffice index 2ac3c54..2ecfef3 100644 --- a/files/apt/60-libreoffice +++ b/files/apt/60-libreoffice @@ -1,3 +1,3 @@ -Package: libreoffice libreoffice-gtk3 libreoffice-l10n-fr +Package: ~/libreoffice/ Pin: release n=stretch-backports Pin-Priority: 991 diff --git a/files/apt/60-remmina b/files/apt/60-remmina index f15a097..1662356 100644 --- a/files/apt/60-remmina +++ b/files/apt/60-remmina @@ -1,3 +1,3 @@ Package: remmina remmina-plugin-rdp -in: release n=stretch-backports +Pin: release n=stretch-backports Pin-Priority: 991 diff --git a/files/packages.list b/files/packages.list index e3c43c9..c972fa3 100644 --- a/files/packages.list +++ b/files/packages.list @@ -3,6 +3,13 @@ pulseaudio unzip unattended-upgrades +apt-listchanges +exfat-utils +exfat-fuse +ntfs-3g +firmware-linux +firmware-linux-nonfree +firmware-realtek # Desktop xorg @@ -21,6 +28,7 @@ xfce4-systemload-plugin thunar-archive-plugin gnome-system-tools gnome-disk-utility +gnome-keyring plank #Printing @@ -53,6 +61,9 @@ thunderbird thunderbird-l10n-fr vlc vlc-l10n +remmina +remmina-plugin-rdp +xarchiver #FI Agent fusioninventory-agent diff --git a/install.sh b/install.sh index 13bd2a0..59c3c94 100755 --- a/install.sh +++ b/install.sh @@ -82,22 +82,22 @@ create_fusioninv_conf () { } configure_drm(){ - if [ -z "$(grep -o drm $INITRAMFS_CONF_FILE)" ] + if [ -z "$(grep -o drm $INITRAMFS_CONF_FILE)" ] then - cat "drm" >> $INITRAMFS_CONF_FILE + echo "drm" >> $INITRAMFS_CONF_FILE else message "DRM already done " "warn" fi if [ -z "$(grep -o $1 $INITRAMFS_CONF_FILE)" ] then - cat "$1 modeset=1" >> $INITRAMFS_CONF_FILE + echo "$1 modeset=1" >> $INITRAMFS_CONF_FILE else message "$1 already done " "warn" fi } configure_grub (){ - sed -E "s/^GRUB_CMDLINE_LINUX_DEFAULT=\"(.*)\"/GRUB_CMDLINE_LINUX_DEFAULT=\"\1 spash\"/g" ${GRUB_DEFAULT_CONF_FILE} >/dev/null + sed -Ei "s/^GRUB_CMDLINE_LINUX_DEFAULT=\"(.*)\"/GRUB_CMDLINE_LINUX_DEFAULT=\"\1 splash\"/g" ${GRUB_DEFAULT_CONF_FILE} >/dev/null update-grub2 2>/dev/null } @@ -154,6 +154,10 @@ message "\nCreate users default parameters : " cp -R files/skel/ /etc/ &> /dev/null message "OK" "ok" +message "\nConfigure fusioninventory" +create_fusioninv_conf +message "OK" "ok" + #remove interface file until NM use network rm -rf /etc/network/interfaces