diff options
| author | Christian Rößler | 2014-07-14 17:15:40 +0200 |
|---|---|---|
| committer | Christian Rößler | 2014-07-14 17:15:40 +0200 |
| commit | 222ff84f3ba3b77929efcdcac315b26ee48b4527 (patch) | |
| tree | 5c1909b6949a2973ca0f55739a53ae8a7350fc00 | |
| parent | [SSPS] Some cosmetics (diff) | |
| download | setup-scripts-222ff84f3ba3b77929efcdcac315b26ee48b4527.tar.gz setup-scripts-222ff84f3ba3b77929efcdcac315b26ee48b4527.tar.xz setup-scripts-222ff84f3ba3b77929efcdcac315b26ee48b4527.zip | |
[SSPS] samba ready, some more cosmetics
5 files changed, 9 insertions, 7 deletions
diff --git a/satellit_installer/includes/10-check_pureftpd_key.inc b/satellit_installer/includes/10-check_pureftpd_key.inc index 56ee5d2..7ba3ce1 100644 --- a/satellit_installer/includes/10-check_pureftpd_key.inc +++ b/satellit_installer/includes/10-check_pureftpd_key.inc @@ -1,18 +1,21 @@ check_pureftpd_key() { echo -n "# Checking existence of a key for pure-ftpd in /etc/ssl/private..." if [ ! -f /etc/ssl/private/pure-ftpd.pem ]; then - echo " no key found; generating a standard key." + echo -n " No key found; generating a standard key..." openssl req -x509 -nodes -newkey rsa:1024 -days 3650 \ -subj "/C=DE/ST=Baden-Wuerttemberg/L=Freiburg/O=RZ Freiburg/OU=bwLehrpool/CN=openslx" \ -keyout /etc/ssl/private/pure-ftpd.pem \ - -out /etc/ssl/private/pure-ftpd.pem + -out /etc/ssl/private/pure-ftpd.pem \ + 2>/dev/null ERR=$? if [ "$ERR" -ne 0 ]; then echo echo "# Could not autogenerate a ssl key; error code ${ERR}." echo "# So you need to generate a key by hand before pureftpd will run." + else + echo " ok." fi else - echo " ok." + echo " ok, key found." fi } diff --git a/satellit_installer/includes/10-configurations.inc b/satellit_installer/includes/10-configurations.inc index 1f18376..fa8dd80 100644 --- a/satellit_installer/includes/10-configurations.inc +++ b/satellit_installer/includes/10-configurations.inc @@ -38,7 +38,7 @@ patch_lighttpd_config() { echo -n "# Starting lighttpd server..." mkdir -p "$1" 2>/dev/null /etc/init.d/lighttpd start 2>/dev/null 1>&2 - cd - + cd - 1>/dev/null echo "ok." } diff --git a/satellit_installer/includes/20-setup_samba.inc b/satellit_installer/includes/20-setup_samba.inc index 2869386..13a143d 100644 --- a/satellit_installer/includes/20-setup_samba.inc +++ b/satellit_installer/includes/20-setup_samba.inc @@ -1,6 +1,6 @@ setup_sambauser() { echo -n "# Setting up samba user $1..." - echo -ne "$2\n$2\n" | smbpasswd -a -s -U "$1" # $1: User, $2: Password + echo -ne "$2\n$2\n" | smbpasswd -a -s -U "$1" 2>/dev/null # $1: User, $2: Password ERR=$? if [ "$ERR" -ne 0 ]; then echo diff --git a/satellit_installer/includes/50-install_bwSuite_server.inc b/satellit_installer/includes/50-install_bwSuite_server.inc index a237ee4..72575c9 100644 --- a/satellit_installer/includes/50-install_bwSuite_server.inc +++ b/satellit_installer/includes/50-install_bwSuite_server.inc @@ -20,7 +20,5 @@ install_bwSuite_server() { cp -p "$BASEDIR/static_files/bwLehrpoolSuite_Server.jar" "$1/bwLehrpoolSuite_Server.jar" echo "ok." - echo -n "# Installing server part of bwSuite... " config_bwSuite_server "$1" - echo "ok." } diff --git a/satellit_installer/includes/99-end_message.inc b/satellit_installer/includes/99-end_message.inc index 0837e1e..d9e8cc2 100644 --- a/satellit_installer/includes/99-end_message.inc +++ b/satellit_installer/includes/99-end_message.inc @@ -10,4 +10,5 @@ end_message() { echo "# directory (file: $BASEDIR/static_files/new_passwords.encrypted)." echo "#" echo "# And - have a nice day!" + echo } |