Merge pull request #97 from TheTorProject/release/lepidopter-1.0.0-rc.0

Prepare release: lepidopter 1.0.0-rc.0

Author: anadahz

ChangeLog.md

@@ -1,3 +1,24 @@
+Lepidopter v1.0.0 [2017-05-05]
+-------------------------------
+
+This release version includes ooniprobe version 2.2.0.
+
+- Add bootloader configuration file
+- Adjust to the minimum GPG memory possible (16M) #49
+- Add support for hardware RNG #96
+- Verbose heartbeat-like LED activity
+- Change MOTD color prompt
+- Password-less operation for the sudo group
+- Ship ooniprobe version 2.2.0
+- Do not store folders in the zip image archive #93
+- Add a persistent directory (/persistent-data)
+- Remove older obfsproxy package
+- Add packages: OpenVPN, rng-tools, watchdog
+- Fix active meek tor bridges
+- Set mount option noatime
+- Reduce GPU memory to 32M (was 64M)
+- Pin txtorcon package version to 0.18.0
+
 Lepidopter v0.3.5-beta [2016-10-16]
 ------------------------------------
 

README.md

@@ -25,7 +25,10 @@ User documentation and detailed image installation instructions can be found
 ├── customize       customize script used to customize lepidopter image
 ├── images          where the build Lepidopter images created
 ├── lepidopter-fh   Lepidopter image filesystem hierarchy
+│   ├── boot
+│   │   └── config.txt
 │   ├── cleanup.sh  cleanup script
+│   ├── configure.sh
 │   ├── etc
 │   │   ├── apt
 │   │   │   └── apt.conf.d
@@ -52,28 +55,49 @@ User documentation and detailed image installation instructions can be found
 │   │   │   ├── lepidopter-update
 │   │   │   └── ooniprobe
 │   │   ├── motd.head                           Lepidopter MOTD ASCII logo
-│   │   ├── network
-│   │   │   └── if-up.d
-│   │   │       └── run_oonideckgen
 │   │   ├── ooniprobe
 │   │   │   └── ooniconfig.sh
 │   │   ├── ooniprobe.conf
+│   │   ├── sudoers
 │   │   ├── systemd
 │   │   │   └── system
 │   │   │       ├── lepidopter-update.service
 │   │   │       └── ooniprobe.service
-│   │   └── update-motd.d
-│   │       └── 50-lepidopter
+│   │   ├── update-motd.d
+│   │   │   └── 50-lepidopter
+│   │   └── watchdog.conf
 │   ├── opt
 │   │   └── ooni
 │   │       ├── lepidopter-update
 │   │       │   ├── public.asc
 │   │       │   ├── updater.py
 │   │       │   └── versions
+│   │       │       ├── update-1.py
+│   │       │       ├── update-1.py.asc
+│   │       │       ├── update-2.py
+│   │       │       ├── update-2.py.asc
+│   │       │       ├── update-3.py
+│   │       │       ├── update-3.py.asc
+│   │       │       ├── update-4.py
+│   │       │       ├── update-4.py.asc
+│   │       │       ├── update-5.py
+│   │       │       ├── update-5.py.asc
+│   │       │       ├── update-6.py
+│   │       │       ├── update-6.py.asc
+│   │       │       ├── update-7.py
+│   │       │       └── update-7.py.asc
 │   │       └── tor_data_dir
+│   ├── persistent-data
 │   ├── remove_ssh_host_keys.sh
 │   ├── setup-ooniprobe.sh
+│   ├── usr
+│   │   └── share
+│   │       └── ooni
+│   │           └── decks-available
 │   └── var
+│       ├── lib
+│       │   └── ooni
+│       │       └── decks-enabled
 │       └── log
 │           └── ooni
 ├── lepidopter-vmdebootstrap_build.sh   main lepidopter vmdebootstrap script

conf/lepidopter-image.conf

@@ -7,3 +7,7 @@ APT_MIRROR="http://httpredir.debian.org/debian"
 # Uncomment next line to use apt-cacher-ng
 #MIRROR="http://localhost:3142/debian"
 MIRROR="http://httpredir.debian.org/debian"
+VERSION_FILE="lepidopter-fh/etc/lepidopter_version"
+LEPIDOPTER_UPDATE_PATH="lepidopter-fh/opt/ooni/lepidopter-update/"
+UPDATE_VERSION_FILE="lepidopter-fh/etc/lepidopter-update/version"
+LEPIDOPTER_UPDATE_GIT="https://github.com/OpenObservatory/lepidopter-update"

conf/tor-pt.conf

@@ -1,5 +1,5 @@
 # Uncomment the following 4 lines to connect via meek pluggable transport in tor
 #UseBridges 1
 #Bridge meek_lite 0.0.2.0:1 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com
-#Bridge meek_lite 0.0.2.0:2 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com
+#Bridge meek_lite 0.0.2.0:2 url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com
 #ClientTransportPlugin meek_lite exec /usr/bin/obfs4proxy

customize

@@ -23,11 +23,6 @@ wget --directory-prefix=${ROOTDIR}/lib/firmware/brcm/ \
 https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm80211/brcm/brcmfmac43430-sdio.bin \
 https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm80211/brcm/brcmfmac43430-sdio.txt
 
-# Add module for hardware RNG
-cat <<EOF >> ${ROOTDIR}/etc/modules
-bcm2708_rng
-EOF
-
 # Add an apt repository with apt preferences
 set_apt_sources() {
     SUITE="$1"
@@ -82,5 +77,11 @@ chroot ${ROOTDIR} ln -s /var/run/motd /etc/motd
 # Add (optional) pluggable transport support in tor config
 cat conf/tor-pt.conf >> ${ROOTDIR}/etc/tor/torrc
 
+# Get list of apt and Python packages from lepidopter image
+rsync -av --no-R --no-implied-dirs --remove-source-files \
+${ROOTDIR}/lepidopter-apt-packages pkglist/lepidopter-${LEPIDOPTER_BUILD}-${ARCH}-apt-packages
+rsync -av --no-R --no-implied-dirs --remove-source-files \
+${ROOTDIR}/lepidopter-pip-packages pkglist/lepidopter-${LEPIDOPTER_BUILD}-${ARCH}-pip-packages
+
 echo "Customize script finished successfully."
 exit 0

lepidopter-fh/boot/config.txt

@@ -0,0 +1,8 @@
+# Minimal (with no vc_vchi_sm_init failure) GPU memory for headless mode
+gpu_mem=32
+# Enable the hardware watchdog
+dtparam=watchdog=on
+# Turn power LED into heartbeat
+dtparam=pwr_led_trigger=heartbeat
+# Enable the hardware random number generator (RNG)
+dtparam=random=on

lepidopter-fh/cleanup.sh

@@ -1,6 +1,10 @@
 #!/usr/bin/env bash
 set -ex
 
+# Generate list of installed apt and Python packages
+dpkg-query -W -f='${binary:Package} ${Version}\n' > /lepidopter-apt-packages
+pip freeze > /lepidopter-pip-packages
+
 # Clean up the local repository of retrieved package files
 apt-get clean
 apt-get autoclean

lepidopter-fh/configure.sh

@@ -7,4 +7,10 @@ cp /usr/share/zoneinfo/UTC /etc/localtime
 # Enable lepidopter-update systemd service
 systemctl enable lepidopter-update
 
+# Install newest e2fsprogs due to incompatibly with ext4 file system checks
+apt-get -y install -t jessie-backports e2fsprogs
+
+# Mount option noatime disables file access writes every time a file is read
+sed -i 's/\/ ext4/\/ ext4 defaults,noatime/' /etc/fstab
+
 history -c

lepidopter-fh/etc/lepidopter-update/version

@@ -1 +1 @@
-3
+8

lepidopter-fh/etc/lepidopter_version

@@ -1 +1 @@
-0.3.5-beta
+v1.0.0