diff --git a/.gitignore b/.gitignore index ea0f5de..b617e87 100644 --- a/.gitignore +++ b/.gitignore @@ -3,10 +3,8 @@ .kdev4/* client_software/.sync_*.db client_software/setup_system.conf -config/setup_system.conf -config/*.bak -config/skel.tar.zst -config/.sync_*.db +config/* +!config/README.md config.d/*.conf config.d/*.sys config.d/*.bak diff --git a/client_software/0020_nextcloud_mozilla_pre/user_run.sh b/client_software/0020_nextcloud_mozilla_pre/user_run.sh index ac2a392..6a30af3 100755 --- a/client_software/0020_nextcloud_mozilla_pre/user_run.sh +++ b/client_software/0020_nextcloud_mozilla_pre/user_run.sh @@ -21,6 +21,9 @@ from webdav3.client import Client #Variables thunderbird_tar = os.path.dirname(__file__) + '/thunderbird.tar.zst' firefox_tar = os.path.dirname(__file__) + '/firefox.tar.zst' +#If defined, use another Profile for that Company +if 'PROFILE_FIREFOX_TAR_FILE' in environ: + firefox_tar=environ['PROFILE_FIREFOX_TAR_FILE'] firefoxhome_path = environ['HOME'] + "/.config/mozilla/firefox" firefoxhome_profile_src = os.path.dirname(__file__) + '/profiles_ff.ini' firefoxhome_profile_dst = firefoxhome_path + '/profiles.ini' diff --git a/system_setup/config.dist/setup_system.conf.dist b/system_setup/config.dist/setup_system.conf.dist index 9a0afc3..bede8c8 100644 --- a/system_setup/config.dist/setup_system.conf.dist +++ b/system_setup/config.dist/setup_system.conf.dist @@ -68,12 +68,18 @@ if [ "$EUID" -ne 0 ]; then export CLIENT_DATA_SYNC_DECLARE="$(declare -p CLIENT_DATA_SYNC)" # Do not remove #End of Sync Folder for nextcloud client - #Firefox Profiles of the User + #Firefox Profiles export PROFILE_FIREFOX_RESET_LOCAL="true" # Set this to wipe ~/.mozilla each time if you don't want users to setup their own firefox profile + # Optional: own Firefox profile used for this company if given as default + # You may use any tar file, that contains a valid firefox profile set up to your companies need. + # As example look at 0020_nextcloud_mozilla_pre/firefox.tar.zst + # You should put it under e.g SYSCONFIGPATH and than use the filepath relative. e.g. "${SYSCONFIGPATH}/firefox.tar.zst" + export PROFILE_FIREFOX_TAR_FILE="" + #Mozilla profile paths on Nextcloud Server. Syncs your profiles to Nextcloud. export PROFILE_FIREFOX_SRC="mozilla_profiles/firefox" export PROFILE_FIREFOX_DST="${DECRYPTEDDATADIR}/firefox" - #Thunderbird Profiles + #Thunderbird Profiles to also be synced export PROFILE_TB_SRC="mozilla_profiles/thunderbird" export PROFILE_TB_DST="${DECRYPTEDDATADIR}/thunderbird"