diff options
| author | jrayhawk+piny.be@omgwallhack.org <jrayhawk@dev.piny.svcs.cs.pdx.edu> | 2011-01-09 21:09:14 -0800 |
|---|---|---|
| committer | jrayhawk+piny.be@omgwallhack.org <jrayhawk@dev.piny.svcs.cs.pdx.edu> | 2011-01-09 21:09:14 -0800 |
| commit | 56fa7965d82f66e5e4608d53e6781e8441ad16b9 (patch) | |
| tree | 7198d06739216a5839c254699a1082acc9762dd4 | |
| parent | 1f302515f68e317a8a997f86f313e544826391eb (diff) | |
| download | piny-code-56fa7965d82f66e5e4608d53e6781e8441ad16b9.tar.gz piny-code-56fa7965d82f66e5e4608d53e6781e8441ad16b9.zip | |
Move cgi-bin resources into cgi-bin/piny/ and cgi-bin/piny/auth
| -rw-r--r-- | pinyconfigs/etc/apache2/sites-available/piny | 6 | ||||
| -rw-r--r-- | pinyweb/Makefile | 5 | ||||
| -rwxr-xr-x | pinyweb/cgi-bin/auth/newrepo.cgi (renamed from pinyweb/cgi-bin/piny/newrepo.cgi) | 0 | ||||
| -rw-r--r-- | pinyweb/cgi-bin/newuser.cgi (renamed from pinyweb/cgi-bin/piny-newuser.cgi) | 0 |
4 files changed, 6 insertions, 5 deletions
diff --git a/pinyconfigs/etc/apache2/sites-available/piny b/pinyconfigs/etc/apache2/sites-available/piny index 6dbbf87..0904ea6 100644 --- a/pinyconfigs/etc/apache2/sites-available/piny +++ b/pinyconfigs/etc/apache2/sites-available/piny @@ -48,7 +48,7 @@ Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch </Directory> - <Directory "/usr/lib/cgi-bin/piny"> + <Directory "/usr/lib/cgi-bin/piny/auth"> AuthPAM_Enabled on AuthGROUP_Enabled on AuthPAM_FallThrough off @@ -59,8 +59,8 @@ </Directory> ScriptAlias /cgit /usr/lib/cgi-bin/cgit.cgi - ScriptAlias /piny-newuser /usr/lib/cgi-bin/piny-newuser.cgi - ScriptAlias /piny/ /usr/lib/cgi-bin/piny/ + ScriptAlias /piny-newuser /usr/lib/cgi-bin/piny/newuser.cgi + ScriptAlias /auth/ /usr/lib/cgi-bin/piny/auth/ Include /etc/apache2/piny-enabled diff --git a/pinyweb/Makefile b/pinyweb/Makefile index 52c3dcf..4c0055d 100644 --- a/pinyweb/Makefile +++ b/pinyweb/Makefile @@ -2,8 +2,9 @@ build: $(MAKE) -C suid install: - install -o root -g root -m 755 -d $(DESTDIR)/usr/lib/cgi-bin $(DESTDIR)/usr/sbin - install -o root -g root -m 755 cgi-bin/* $(DESTDIR)/usr/lib/cgi-bin + install -o root -g root -m 755 -d $(DESTDIR)/usr/lib/cgi-bin/piny $(DESTDIR)/usr/sbin + install -o root -g root -m 755 cgi-bin/newuser.cgi $(DESTDIR)/usr/lib/cgi-bin/piny + install -o root -g root -m 755 cgi-bin/auth/* $(DESTDIR)/usr/lib/cgi-bin/piny/auth install -o root -g shadow -m 4754 suid/piny-suid $(DESTDIR)/usr/sbin # FIXME: this should really be www-data somehow clean: diff --git a/pinyweb/cgi-bin/piny/newrepo.cgi b/pinyweb/cgi-bin/auth/newrepo.cgi index 450fa82..450fa82 100755 --- a/pinyweb/cgi-bin/piny/newrepo.cgi +++ b/pinyweb/cgi-bin/auth/newrepo.cgi diff --git a/pinyweb/cgi-bin/piny-newuser.cgi b/pinyweb/cgi-bin/newuser.cgi index 002d2be..002d2be 100644 --- a/pinyweb/cgi-bin/piny-newuser.cgi +++ b/pinyweb/cgi-bin/newuser.cgi |