Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions google-users-d-README
Original file line number Diff line number Diff line change
@@ -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.

1 change: 1 addition & 0 deletions packaging/google-compute-engine-oslogin.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -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