From 023325840eb47c131e242d8f54456f8d5a299d3a Mon Sep 17 00:00:00 2001 From: mid-kid Date: Sat, 21 Jan 2017 13:56:44 +0100 Subject: [PATCH] Add wheel to sudoers, move /etc/profile changes to /etc/profile.d. --- etc/profile | 68 ------------------------------- etc/profile.d/unset-less.sh | 2 + etc/profile.d/wheel-path.sh | 4 ++ etc/profile.orig | 79 ------------------------------------- etc/sudoers.d/wheel | 1 + readme.txt | 15 ++++++- rocket-config.SlackBuild | 6 +++ 7 files changed, 26 insertions(+), 149 deletions(-) delete mode 100644 etc/profile create mode 100644 etc/profile.d/unset-less.sh create mode 100644 etc/profile.d/wheel-path.sh delete mode 100644 etc/profile.orig create mode 100644 etc/sudoers.d/wheel diff --git a/etc/profile b/etc/profile deleted file mode 100644 index a2067df..0000000 --- a/etc/profile +++ /dev/null @@ -1,68 +0,0 @@ -# /etc/profile: This file contains system-wide defaults used by -# all Bourne (and related) shells. - -# Set the values for some environment variables: -export MINICOM="-c on" -export MANPATH=/usr/local/man:/usr/man -export HOSTNAME="`cat /etc/HOSTNAME`" -export LESSOPEN="|lesspipe.sh %s" - -# If the user doesn't have a .inputrc, use the one in /etc. -if [ ! -r "$HOME/.inputrc" ]; then - export INPUTRC=/etc/inputrc -fi - -# Set the default system $PATH: -PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" - -# I had problems with the backspace key using 'eval tset' instead of 'TERM=', -# but you might want to try it anyway instead of the section below it. I -# think with the right /etc/termcap it would work. -# eval `tset -sQ "$TERM"` - -# Set TERM to linux for unknown type or unset variable: -if [ "$TERM" = "" -o "$TERM" = "unknown" ]; then - TERM=linux -fi - -# Set ksh93 visual editing mode: -if [ "$SHELL" = "/bin/ksh" ]; then - VISUAL=emacs -# VISUAL=gmacs -# VISUAL=vi -fi - -# Set a default shell prompt: -#PS1='`hostname`:`pwd`# ' -if [ "$SHELL" = "/bin/pdksh" ]; then - PS1='! $ ' -elif [ "$SHELL" = "/bin/ksh" ]; then - PS1='! ${PWD/#$HOME/~}$ ' -elif [ "$SHELL" = "/bin/zsh" ]; then - PS1='%n@%m:%~%# ' -elif [ "$SHELL" = "/bin/ash" ]; then - PS1='$ ' -else - PS1='\u@\h:\w\$ ' -fi -PS2='> ' -export PATH DISPLAY LESS TERM PS1 PS2 - -# Default umask. A umask of 022 prevents new files from being created group -# and world writable. -umask 022 - -# Notify user of incoming mail. This can be overridden in the user's -# local startup file (~/.bash.login or whatever, depending on the shell) -if [ -x /usr/bin/biff ]; then - biff y 2> /dev/null -fi - -# Append any additional sh scripts found in /etc/profile.d/: -for profile_script in /etc/profile.d/*.sh ; do - if [ -x $profile_script ]; then - . $profile_script - fi -done -unset profile_script - diff --git a/etc/profile.d/unset-less.sh b/etc/profile.d/unset-less.sh new file mode 100644 index 0000000..f3970ac --- /dev/null +++ b/etc/profile.d/unset-less.sh @@ -0,0 +1,2 @@ +# Unset the LESS variable to prevent problems with some programs +unset LESS diff --git a/etc/profile.d/wheel-path.sh b/etc/profile.d/wheel-path.sh new file mode 100644 index 0000000..d234cd5 --- /dev/null +++ b/etc/profile.d/wheel-path.sh @@ -0,0 +1,4 @@ +# Add sbin paths for wheel users +if groups | grep -q '\bwheel\b'; then + export PATH="/usr/local/sbin:/usr/sbin:/sbin:$PATH" +fi diff --git a/etc/profile.orig b/etc/profile.orig deleted file mode 100644 index 8c5df4d..0000000 --- a/etc/profile.orig +++ /dev/null @@ -1,79 +0,0 @@ -# /etc/profile: This file contains system-wide defaults used by -# all Bourne (and related) shells. - -# Set the values for some environment variables: -export MINICOM="-c on" -export MANPATH=/usr/local/man:/usr/man -export HOSTNAME="`cat /etc/HOSTNAME`" -export LESSOPEN="|lesspipe.sh %s" -export LESS="-M" - -# If the user doesn't have a .inputrc, use the one in /etc. -if [ ! -r "$HOME/.inputrc" ]; then - export INPUTRC=/etc/inputrc -fi - -# Set the default system $PATH: -PATH="/usr/local/bin:/usr/bin:/bin:/usr/games" - -# For root users, ensure that /usr/local/sbin, /usr/sbin, and /sbin are in -# the $PATH. Some means of connection don't add these by default (sshd comes -# to mind). -if [ "`id -u`" = "0" ]; then - echo $PATH | grep /usr/local/sbin 1> /dev/null 2> /dev/null - if [ ! $? = 0 ]; then - PATH=/usr/local/sbin:/usr/sbin:/sbin:$PATH - fi -fi - -# I had problems with the backspace key using 'eval tset' instead of 'TERM=', -# but you might want to try it anyway instead of the section below it. I -# think with the right /etc/termcap it would work. -# eval `tset -sQ "$TERM"` - -# Set TERM to linux for unknown type or unset variable: -if [ "$TERM" = "" -o "$TERM" = "unknown" ]; then - TERM=linux -fi - -# Set ksh93 visual editing mode: -if [ "$SHELL" = "/bin/ksh" ]; then - VISUAL=emacs -# VISUAL=gmacs -# VISUAL=vi -fi - -# Set a default shell prompt: -#PS1='`hostname`:`pwd`# ' -if [ "$SHELL" = "/bin/pdksh" ]; then - PS1='! $ ' -elif [ "$SHELL" = "/bin/ksh" ]; then - PS1='! ${PWD/#$HOME/~}$ ' -elif [ "$SHELL" = "/bin/zsh" ]; then - PS1='%n@%m:%~%# ' -elif [ "$SHELL" = "/bin/ash" ]; then - PS1='$ ' -else - PS1='\u@\h:\w\$ ' -fi -PS2='> ' -export PATH DISPLAY LESS TERM PS1 PS2 - -# Default umask. A umask of 022 prevents new files from being created group -# and world writable. -umask 022 - -# Notify user of incoming mail. This can be overridden in the user's -# local startup file (~/.bash.login or whatever, depending on the shell) -if [ -x /usr/bin/biff ]; then - biff y 2> /dev/null -fi - -# Append any additional sh scripts found in /etc/profile.d/: -for profile_script in /etc/profile.d/*.sh ; do - if [ -x $profile_script ]; then - . $profile_script - fi -done -unset profile_script - diff --git a/etc/sudoers.d/wheel b/etc/sudoers.d/wheel new file mode 100644 index 0000000..7c7dbb8 --- /dev/null +++ b/etc/sudoers.d/wheel @@ -0,0 +1 @@ +%wheel ALL=(ALL) ALL diff --git a/readme.txt b/readme.txt index 022ff56..22172eb 100644 --- a/readme.txt +++ b/readme.txt @@ -26,16 +26,27 @@ Changes: /etc/rc.d/rc.alsa: - Just added a newline at the end to differentiate from the original and set the permissions to 755 -/etc/profile: -- Added sbin paths to the PATH for all users +/etc/rc.d/rc.psd: +- Start the Profile-Sync-Daemon + +/etc/profile.d/wheel-path.sh: +- Added sbin paths to the PATH for users in the wheel group + +/etc/profile.d/unset-less.sh: - Removed LESS variable to fix colors in git log /etc/profile.d/xdg-runtime-dir.sh: - Create/Set XDG_RUNTIME_DIR properly +/etc/sudoers.d/wheel: +- Allow all users in the wheel group to access sudo + /etc/sysctl.d/swappiness.conf: - Set vm.swappiness to 0 +/etc/cron.hourly/psd: +- Resync /etc/rc.d/rc.psd on a hourly basis, if enabled. + /etc/dhcpcd.conf: - Removed nohook for wpa_supplicant, to run it on every wireless interface diff --git a/rocket-config.SlackBuild b/rocket-config.SlackBuild index b101795..1017f04 100755 --- a/rocket-config.SlackBuild +++ b/rocket-config.SlackBuild @@ -11,18 +11,22 @@ PKG=$TMP/package-rocket-config rm -rf $PKG mkdir -p $TMP $PKG +# Install package metadata mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh +# Install package docs mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cat $CWD/readme.txt > $PKG/usr/doc/$PKGNAM-$VERSION/readme.txt cat $CWD/blacklist > $PKG/usr/doc/$PKGNAM-$VERSION/blacklist +# Install all config files find $CWD/etc -type f ! -name '*.orig' -printf '%P\n' | while read config; do echo Installing /etc/$config install -Dm644 $CWD/etc/$config $PKG/etc/$config.new + # Add config lines to doinst.sh if [ -r $CWD/etc/$config.orig ]; then echo config etc/$config.new $(cat $CWD/etc/$config.orig | md5sum | cut -d ' ' -f 1) >> $PKG/install/doinst.sh else @@ -32,6 +36,8 @@ done # Set some special permissions chmod 755 $PKG/etc/rc.d/rc.* $PKG/etc/X11/xinit/* $PKG/etc/profile.d/* $PKG/etc/cron.*/* +chmod 750 $PKG/etc/sudoers.d +chmod 440 $PKG/etc/sudoers.d/* cd $PKG /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz