mostly reorganizing and cleanup

[distro-setup] / filesystem / etc / profile.d / environment.sh

diff --git a/filesystem/etc/profile.d/environment.sh b/filesystem/etc/profile.d/environment.sh
index ed621d6ad409caf6ab1daabc8bf8065688d0af3b..4c5794f4fc918219cc18131e9e5e22f3f0f14f0e 100644 (file)
--- a/filesystem/etc/profile.d/environment.sh
+++ b/filesystem/etc/profile.d/environment.sh
@@ -1,6 +1,3 @@
-export ACME_TINY_WRAPPER_CERT_DIR=/p/c/machine_specific/$HOSTNAME/webservercerts
-export ACME_TINY_PATH="/a/opt/acme-tiny/acme_tiny.py"
-
 if [ -f $HOME/path_add-function ]; then
     . $HOME/path_add-function
     path_add /usr/sbin /usr/local/sbin /sbin
@@ -58,12 +55,21 @@ if [ -f /etc/fedora-release ]; then
     fi
 fi
 
+# background:
 # ubuntu has 002 for non-system users, debian has 022.  002 makes groups
-# be rw instead of r. One security concern is where some unixes put
-# every user in a same group, so if you copy files there with exact
-# perms, that is probably not what you want. I don't use a system like
-# that. I don't care much either way, but the ubuntu one seems a bit
-# more user friendly.
-if (( EUID >= 1000 )); then
-    umask 002
-fi
+# be rw instead of r.
+#
+# ubuntu is more user friendly when using multiple users. However,
+# it also makes it so if you create a file as a regular user then move
+# it to become a system file, it's got slightly wrong permissions, and
+# sometimes thing break. Also, copying files between ubuntu and debian
+# makes things inconsistent. So stick with 022 umask always.
+#
+# One security concern is where some unixes put every user in a same
+# group, so if you copy files there with exact perms, that is probably
+# not what you want. I don't use a system like that, so I don't
+# care.
+umask 022
+# this is how we could test for non-system user
+
+#if test "$(id -u)" -ge 1000; then : fi