Merge branch 'stretch' of https://github.com/bashrc/freedombone

src/freedombone-app-koel

@@ -176,6 +176,8 @@ function reconfigure_koel {
 }
 
 function koel_import_from_directory {
+    read_config_param MY_USERNAME
+
     data=$(mktemp 2>/dev/null)
     dialog --title "Choose a directory containing music" --dselect "/home/$MY_USERNAME/" 30 60 2> "$data"
     selected_dir=$(cat "$data")

src/freedombone-app-pleroma

@@ -42,6 +42,7 @@ PLEROMA_COMMIT='303289d7daac3a51f991bb8603f36628a5d944c1'
 PLEROMA_ADMIN_PASSWORD=
 PLEROMA_DIR=/etc/pleroma
 PLEROMA_SECRET_KEY=""
+pleroma_secret=$PLEROMA_DIR/config/dev.secret.exs
 
 PLEROMA_BACKGROUND_IMAGE_URL=
 
@@ -406,7 +407,6 @@ function pleroma_create_database {
         echo $"Missing directory $PLEROMA_DIR/config"
         exit 7835393
     fi
-    pleroma_secret=$PLEROMA_DIR/config/dev.secret.exs
     if [ ! -f $PLEROMA_DIR/config/dev.exs ]; then
         echo $"Did not find $PLEROMA_DIR/config/dev.exs"
         exit 78923528
@@ -1186,7 +1186,6 @@ function install_pleroma {
 
     # We need to set up the url option again because it somehow gets
     # lost during mix compile
-    pleroma_secret=$PLEROMA_DIR/config/dev.secret.exs
     if ! grep -q 'watchers: [],' $pleroma_secret; then
         sed -i 's|watchers: \[\]|watchers: \[\],|g' $pleroma_secret
     fi

src/freedombone-client

@@ -94,13 +94,17 @@ function refresh_gpg_keys {
         fi
     fi
     sudo cp /etc/crontab ~/temp_crontab
-    sudo chown "$CURR_USER":"$CURR_GROUP" ~/temp_crontab
-    if ! grep -q 'gpg --refresh-keys' ~/temp_crontab; then
-        echo "0            */$REFRESH_GPG_KEYS_HOURS *   *   *   $CURR_USER /usr/bin/gpg --refresh-keys > /dev/null" >> ~/temp_crontab
-        sudo cp ~/temp_crontab /etc/crontab
-        sudo chown root:root /etc/crontab
+    if [ -f ~/temp_crontab ]; then
+        sudo chown "$CURR_USER":"$CURR_GROUP" ~/temp_crontab
+        if grep -q 'test' ~/temp_crontab; then
+            if ! grep -q 'gpg --refresh-keys' ~/temp_crontab; then
+                echo "0            */$REFRESH_GPG_KEYS_HOURS *   *   *   $CURR_USER /usr/bin/gpg --refresh-keys > /dev/null" >> ~/temp_crontab
+                sudo cp ~/temp_crontab /etc/crontab
+                sudo chown root:root /etc/crontab
+            fi
+        fi
+        rm ~/temp_crontab
     fi
-    rm ~/temp_crontab
 }
 
 # see https://stribika.github.io/2015/01/04/secure-secure-shell.html

src/freedombone-image-customise

@@ -1708,7 +1708,7 @@ image_install_inadyn() {
       echo '[Install]';
       echo 'WantedBy=multi-user.target'; } > "$rootdir/etc/systemd/system/inadyn.service"
     chroot "$rootdir" systemctl enable inadyn
-    echo "inadyn commit:$INADYN_COMMIT" >> "$rootdir/root/freedombone-completed.txt"
+    echo "inadyn commit:$INADYN_COMMIT" >> "$rootdir/root/${PROJECT_NAME}-completed.txt"
 }
 
 image_setup_utils() {
@@ -1829,6 +1829,7 @@ image_setup_utils() {
     echo "export PATH=\$PATH:\$GOPATH" >> "${rootdir}/home/go/.bashrc"
     chroot "$rootdir" chown -R go:go /home/go
     cp "${rootdir}/home/go/go${GO_VERSION}/bin/"* "${rootdir}/usr/bin"
+    echo "upgrade_golang:$GO_VERSION" >> "${rootdir}/root/${PROJECT_NAME}-completed.txt"
 
     # Tomb
     chroot "$rootdir" apt-get -yq install zsh pinentry-curses
@@ -1836,7 +1837,7 @@ image_setup_utils() {
     cd "$rootdir/root/build/tomb" || exit 468368345425
     git checkout "$TOMB_COMMIT" -b "$TOMB_COMMIT"
     chroot "$rootdir" cd /root/build/tomb && make install
-    echo "tomb commit:$TOMB_COMMIT" >> "$rootdir/root/freedombone-completed.txt"
+    echo "tomb commit:$TOMB_COMMIT" >> "$rootdir/root/${PROJECT_NAME}-completed.txt"
 
     if ! grep -q '\* hard maxsyslogins' "$rootdir/etc/security/limits.conf"; then
         echo '* hard maxsyslogins 10' >> "$rootdir/etc/security/limits.conf"
@@ -1869,7 +1870,7 @@ image_setup_utils() {
     cd "$rootdir/root/build/gpgit" || exit 62484624682
     git checkout "$GPGIT_COMMIT" -b "$GPGIT_COMMIT"
     cp "$rootdir/root/build/gpgit/gpgit.pl" "$rootdir/usr/bin"
-    echo "gpgit commit:$GPGIT_COMMIT" >> "$rootdir/root/freedombone-completed.txt"
+    echo "gpgit commit:$GPGIT_COMMIT" >> "$rootdir/root/${PROJECT_NAME}-completed.txt"
 
     # email client
     chroot "$rootdir" apt-get -yq install lynx abook urlview mutt
@@ -1878,7 +1879,7 @@ image_setup_utils() {
     cd "$rootdir/root/build/cleanup-maildir" || exit 246872646847264
     git checkout "$CLEANUP_MAILDIR_COMMIT" -b "$CLEANUP_MAILDIR_COMMIT"
     cp "$rootdir/root/build/cleanup-maildir/cleanup-maildir" "$rootdir/usr/bin"
-    echo "cleanup-maildir commit:$CLEANUP_MAILDIR_COMMIT" >> "$rootdir/root/freedombone-completed.txt"
+    echo "cleanup-maildir commit:$CLEANUP_MAILDIR_COMMIT" >> "$rootdir/root/${PROJECT_NAME}-completed.txt"
 
     # web server
     chroot "$rootdir" apt-get -yq remove --purge apache2
@@ -1886,7 +1887,7 @@ image_setup_utils() {
     git clone "$NGINX_ENSITE_REPO" "$rootdir/root/build/nginx_ensite"
     cd "$rootdir/root/build/nginx_ensite" || exit 462746826482
     git checkout "$NGINX_ENSITE_COMMIT" -b "$NGINX_ENSITE_COMMIT"
-    echo "nginx-ensite commit:$NGINX_ENSITE_COMMIT" >> "$rootdir/root/freedombone-completed.txt"
+    echo "nginx-ensite commit:$NGINX_ENSITE_COMMIT" >> "$rootdir/root/${PROJECT_NAME}-completed.txt"
     chroot "$rootdir" cd /root/build/nginx_ensite && make install
     if [ ! -f "$rootdir/etc/pam.d/nginx" ]; then
         { echo '#%PAM-1.0';
@@ -1902,7 +1903,7 @@ image_setup_utils() {
 
 image_install_nodejs() {
     mesh_install_nodejs
-    #echo 'install_nodejs' >> ${rootdir}/root/${PROJECT_NAME}-completed.txt
+    echo 'install_nodejs' >> "${rootdir}/root/${PROJECT_NAME}-completed.txt"
 }
 
 image_preinstall_repos() {

tests/output.sh

@@ -259,12 +259,12 @@ an administrator.\n\n######################\n\n' >> $LOG
               fi
               ;;
     V-51391)  if [ "$3" = "en" ]; then
-                  log_msg $2 'A file integrity baseline must be created. Reset the tripwire from the administrator control panel.'
+                  log_msg $2 'A file integrity baseline must be created. Reset the tripwire from the administrator control panel under security settings.'
               else
                   log_msg $2 '必须创建文件完整性基线。'
               fi
               if [ $2 -ne 0 ];then
-                  printf '\n######################\n\nSTIG-ID:RHEL-06-000018\n\nVulnerability Discussion: For tripwire to be effective, an initial database of "known-good" information about files must be captured and it should be able to be verified against the installed files.\n\nFix text: Run "reset tripwire" from the administrator control panel.\n\n######################\n\n' >> $LOG
+                  printf '\n######################\n\nSTIG-ID:RHEL-06-000018\n\nVulnerability Discussion: For tripwire to be effective, an initial database of "known-good" information about files must be captured and it should be able to be verified against the installed files.\n\nFix text: Run "reset tripwire" from security settings on the administrator control panel.\n\n######################\n\n' >> $LOG
               fi
               ;;
     V-38491)  if [ "$3" = "en" ]; then