From e892d66859ed28285530770c0950d30669448361 2017-07-27 06:49:43 From: Gérard Vidal Date: 2017-07-27 06:49:43 Subject: [PATCH] Merge pull request #4 from g-vidal/rpifegen Changes in the templates after a set of test executions. --- diff --git a/templates/README.md b/templates/README.md index 6f80f7b..e2d3504 100644 --- a/templates/README.md +++ b/templates/README.md @@ -1,8 +1,12 @@ -## Templates used at IFÉ ENS de Lyon for Tremplin project +## Templates used at IFÉ ENS de Lyon for "Tremplin des sciences" project -These templates have been used to create Raspberry Pi images for the project "Climate and meteorolgy springboard for teaching sciences". These images are used as explained in the [blog](http://blog.climatetmeteo.fr/GerardVidal/) (mostly in french). +These templates have been used to create Raspberry Pi images for the +project "Climate and meteorolgy springboard for teaching sciences". +These images are tuned andused as explained in the +[blog](http://blog.climatetmeteo.fr/GerardVidal/) (mostly in french +but under translation). -The aim was to share with teachers an image providing software resources to use commercial weatherstations or DIY weathersystems made with various sensors. The following images have been built : +The aim is to share with teachers a Raspberry Pi3 binary image providing software resources to use commercial weatherstations or DIY weathersystems made with various sensors. The following images have been built : * raspife2-stretch Debian stretch image for raspi 2 * raspife3-jessie Debian jessie image for raspi 3 @@ -10,4 +14,9 @@ The aim was to share with teachers an image providing software resources to use * raspife3W-stretch Debian stretch image for raspi 3 with single IPAddress and weewx service * raspife3-buster Debian buster image for raspi 3 +In these images language ichoosen is french and can easily be changed. +Pathes and other variables are the ones that have been used during +execution and personnal data are replaced by "*******", change the +values according to your needs. + diff --git a/templates/raspife3-buster b/templates/raspife3-buster index b9c4524..9636b61 100644 --- a/templates/raspife3-buster +++ b/templates/raspife3-buster @@ -22,8 +22,8 @@ tightvncserver,geany,geany-plugin-py,geany-plugin-markdown,firefox-esr,firefox-e RPI_MODEL=3 RELEASE="buster" HOSTNAME="raspife3" -PASSWORD="**************" -USER_PASSWORD="***************" +PASSWORD="***********" +USER_PASSWORD="***********" DEFLOCAL="fr_FR.UTF-8" TIMEZONE="Europe/Paris" EXPANDROOT=false diff --git a/templates/raspife3-stretch b/templates/raspife3-stretch index 5ab2596..904f0a5 100644 --- a/templates/raspife3-stretch +++ b/templates/raspife3-stretch @@ -1,24 +1,29 @@ -# Configuration file raspi3 Stretch IFÉ 2017/04/15 +# Configuration file raspi3 Stretch IFÉ 2017/07/26 # APT_SERVER=ftp.fr.debian.org -APT_INCLUDES="gnupg,gnupg2,firmware-linux-nonfree,firmware-linux,xutils-dev,\ -gettext, tightvncserver,build-essential,git,cmake,libjson-c-dev,unzip,\ -bison,libboost-all-dev,automake,autoconf,autogen,libtool,libtool-bin,pkg-config,checkinstall,menulibre,libnotify-bin, \ -python3,python3-dev,python,python-dev,python-configobj,python-cheetah,python-imaging,python-serial,python-usb,\ -python-tk,python3-tk,python3-scipy,pandoc,python-pypandoc,python3-pypandoc,python-pandocfilters,python3-pandocfilters, \ -python-geopy,python3-geopy,python-pip,python3-pip, \ -pcre2-utils,libpcre++-dev,libpcre2-dev,libjpeg-dev,jed,i2c-tools,python-smbus,policykit-1,usbutils,\ -pmount,geany,geany-plugin-py,geany-plugin-markdown,firefox-esr,firefox-esr-l10n-fr,ntpdate, \ -texlive,texlive-xetex,nginx-extras,ffmpeg,wicd,wicd-gtk,console-data,keyboard-configuration, \ +APT_INCLUDES="gnupg,gnupg2,firmware-linux-nonfree,firmware-linux,dh-autoreconf,\ +gettext,build-essential,git,cmake,libjson-c-dev,unzip,usbutils,\ +bison,libboost-all-dev,automake,autoconf,autogen,libtool,libtool-bin,\ +pkg-config,checkinstall,menulibre,libnotify-bin,pandoc,\ +python3,python3-dev,python3-pypandoc,python3-scipy,python3-tk,python3-pandocfilters,\ +python,python-dev,python-pypandoc,python-scipy,python-tk,python-pandocfilters,\ +python3-geopy,python3-pip,\ +python-geopy,python-pip,\ +python-configobj,python-cheetah,python-imaging,python-serial,python-usb,\ +pcre2-utils,libpcre++-dev,libpcre2-dev,libjpeg-dev,jed,i2c-tools,python-smbus,policykit-1,\ +pmount,ntpdate,\ +texlive,texlive-xetex,nginx-extras,ffmpeg,wicd,wicd-gtk,console-data,keyboard-configuration,\ icedtea-8-plugin,openjdk-8-jdk,openjdk-8-jre,openjdk-8-jre-headless,libqtwebkit-dev,libqt5webkit5-dev,\ libudev-dev,libzzip-dev,zlib1g-dev,libcanberra-gtk-module,libnss-myhostname,libfreetype6-dev,libpng16-16,\ -nmap,libltdl-dev,lxsession,openbox-lxde-session,lxde,dbus-user-session,debian-archive-keyring" +nmap,libltdl-dev,dbus-user-session,debian-archive-keyring,\ +xutils-dev,lxsession,openbox-lxde-session,lxde,x11proto-randr-dev,lxrandr,\ +tightvncserver,geany,geany-plugin-py,geany-plugin-markdown,firefox-esr,firefox-esr-l10n-fr" #---------------------- RPI_MODEL=3 RELEASE="stretch" HOSTNAME="raspife3" -PASSWORD="**********" -USER_PASSWORD="**********" +PASSWORD="**************" +USER_PASSWORD="***************" DEFLOCAL="fr_FR.UTF-8" TIMEZONE="Europe/Paris" EXPANDROOT=false @@ -48,7 +53,7 @@ ENABLE_WM="lxdm" ENABLE_MINBASE=false ENABLE_REDUCE=false ENABLE_UBOOT=false -ENABLE_FBTURBO=false +ENABLE_FBTURBO=true ENABLE_IPTABLES=false ENABLE_USER=true USER_NAME=ens-ife diff --git a/templates/raspife3W-stretch b/templates/raspife3W-stretch index 8b4e016..41247bf 100644 --- a/templates/raspife3W-stretch +++ b/templates/raspife3W-stretch @@ -1,26 +1,23 @@ -# Configuration file raspi3 Stretch IFÉ 2017/04/15 +# Configuration file raspi3 Stretch Weewx IFÉ 2017/07/26 # APT_SERVER=ftp.fr.debian.org -APT_INCLUDES="debian-archive-keyring,debian-keyring,automake,autoconf,autogen,gawk,gnupg,gnupg2, \ +APT_INCLUDES="debian-archive-keyring,debian-keyring,automake,autoconf,autogen,gawk,gnupg,gnupg2,\ build-essential,git,cmake,libjson-c-dev,unzip,\ -bison,libboost-all-dev,libtool,libtool-bin,pkg-config,checkinstall,libnotify-bin,pandoc, \ -python3,python3-dev,python,python-dev,python-configobj,python-cheetah, \ -python-imaging,python-serial,python-usb,python-tk,python3-tk,python3-scipy, \ -python-pypandoc,python3-pypandoc,python-pandocfilters,python3-pandocfilters, \ -python-geopy,python3-geopy,python-pip,python3-pip,python-smbus, \ -libudev-dev,libzzip-dev,zlib1g-dev,libnss-myhostname,libpng16-16,nmap \ -libltdl-dev,usbutils,pmount,ntpdate,texlive,texlive-xetex,nginx-extras,policykit-1" -#firehol" -#ffmpeg,console-data,keyboard-configuration,openjdk-8-jdk, \ -#openjdk-8-jre,openjdk-8-jre-headless,pcre2-utils,libpcre++-dev,libpcre2-dev,libjpeg-dev,i2c-tools, \ -#libcanberra-gtk-module,libqtwebkit-dev,libqt5webkit5-dev,libfreetype6-dev" -#,policykit-1,inetutils-ping,firmware-linux-nonfree,firmware-linux +bison,libboost-all-dev,libtool,libtool-bin,pkg-config,checkinstall,libnotify-bin,pandoc,\ +python3,python3-dev,python,python-dev,python-configobj,python-cheetah,\ +python-imaging,python-serial,python-usb,python-tk,python3-tk,python3-scipy,\ +python-pypandoc,python3-pypandoc,python-pandocfilters,python3-pandocfilters,\ +python-geopy,python3-geopy,python-pip,python3-pip,python-smbus,\ +libudev-dev,libzzip-dev,zlib1g-dev,libnss-myhostname,libpng16-16,nmap,\ +libltdl-dev,usbutils,pmount,ntpdate,texlive,texlive-xetex,nginx-extras,policykit-1,\ +openjdk-8-jdk-headless,openjdk-8-jre-headless,\ +pcre2-utils,libpcre++-dev,libpcre2-dev,libjpeg-dev,i2c-tools" #---------------------- RPI_MODEL=3 RELEASE="stretch" HOSTNAME="raspwife3" -PASSWORD="**************" -USER_PASSWORD="*************" +PASSWORD="************" +USER_PASSWORD="************" DEFLOCAL="fr_FR.UTF-8" TIMEZONE="Europe/Paris" EXPANDROOT=false @@ -31,9 +28,9 @@ XKB_VARIANT="latin9" XKB_OPTIONS="" #------------------------ ENABLE_DHCP=false -NET_ADDRESS="192.168.***.**/**" -NET_GATEWAY="192.168.***.1" -NET_DNS_1="192.168.***.1" +NET_ADDRESS="192.168.221.41/24" +NET_GATEWAY="192.168.221.1" +NET_DNS_1="192.168.221.1" NET_DNS_2="8.8.8.8" #------------------------ ENABLE_CONSOLE=false @@ -65,8 +62,8 @@ ENABLE_IFNAMES=true #------------------------ ENABLE_ROOT_SSH=false SSH_LIMIT_USERS=false -SSH_ROOT_PUB_KEY="/home/********/.ssh/authorized_keys" -SSH_USER_PUB_KEY="/home/********/.ssh/authorized_keys" +SSH_ROOT_PUB_KEY="/home/*******/.ssh/authorized_keys" +SSH_USER_PUB_KEY="/home/*******/.ssh/authorized_keys" #------------------------ BUILD_KERNEL=true KERNEL_REDUCE=false