diff --git a/google-users-d-README b/google-users-d-README new file mode 100644 index 0000000..39330c4 --- /dev/null +++ b/google-users-d-README @@ -0,0 +1,5 @@ +# /var/google-users.d contains per-user sshd configuration for OS Login. +# All files in this directory are included by /etc/ssh/sshd_config, and so +# must be syntactically valid sshd config files. +# Editing files in this directory is not recommended. + diff --git a/packaging/google-compute-engine-oslogin.spec b/packaging/google-compute-engine-oslogin.spec index 28d4be9..d2782b6 100644 --- a/packaging/google-compute-engine-oslogin.spec +++ b/packaging/google-compute-engine-oslogin.spec @@ -86,6 +86,7 @@ make install DESTDIR=%{buildroot} LIBDIR=/%{_lib} VERSION=%{version} INSTALL_SEL /lib/systemd/system/google-oslogin-cache.service /lib/systemd/system/google-oslogin-cache.timer /lib/systemd/system-preset/90-google-compute-engine-oslogin.preset +/var/google-users.d/README %post if [ $1 -eq 1 ]; then diff --git a/src/Makefile b/src/Makefile index c246013..c05d6d5 100644 --- a/src/Makefile +++ b/src/Makefile @@ -20,6 +20,7 @@ MANDIR = /usr/share/man CRONDIR = /etc/cron.d SYSTEMDDIR = /lib/systemd/system PRESETDIR = /lib/systemd/system-preset +GOOGLEUSERSDIR = /var/google-users.d DEST_LIBDIR = $(LIBDIR) DEST_BINDIR = $(BINDIR) @@ -29,6 +30,7 @@ DEST_SELINUX = /usr/share/selinux/packages DEST_CRONDIR = $(CRONDIR) DEST_SYSTEMDDIR = $(SYSTEMDDIR) DEST_PRESETDIR = $(PRESETDIR) +DEST_GOOGLEUSERSDIR = $(GOOGLEUSERSDIR) ifneq ($(DESTDIR),) DEST_LIBDIR = $(DESTDIR)/$(LIBDIR) @@ -39,6 +41,7 @@ DEST_SELINUX = $(DESTDIR)/usr/share/selinux/packages DEST_CRONDIR = $(DESTDIR)/$(CRONDIR) DEST_SYSTEMDDIR = $(DESTDIR)/$(SYSTEMDDIR) DEST_PRESETDIR = $(DESTDIR)/$(PRESETDIR) +DEST_GOOGLEUSERSDIR = $(DESTDIR)/$(GOOGLEUSERSDIR) endif NSS_OSLOGIN_SONAME = libnss_oslogin.so.2 @@ -129,3 +132,7 @@ else install -d $(DEST_PRESETDIR) install -m 0644 -t $(DEST_PRESETDIR) $(TOPDIR)/90-google-compute-engine-oslogin.preset endif + # README file in google-users.d + install -d $(DEST_GOOGLEUSERSDIR) + install -m 0644 -T $(TOPDIR)/google-users-d-README $(DEST_GOOGLEUSERSDIR)/README +