VA
/
virtual-appliance
1
0
Fork 0
Code Issues Pull Requests Releases 7 Wiki Activity

airport: cleanups 

This change makes the Makefile a little more efficient and removes support
for avahi (I never use it).
This commit is contained in:
Albert Hopkins 2018-12-05 17:06:13 -08:00
parent 04d39d94b3
commit 01f25f5ecb
3 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
appliances/airport/Makefile
View File

@ -2,11 +2,24 @@ APP_ROOT := /var/lib/airport
AIRPORT_REPO ?= https://bitbucket.org/marduk/airport AIRPORT_REPO ?= https://bitbucket.org/marduk/airport
AIRPORT_BRANCH ?= stable AIRPORT_BRANCH ?= stable
PGVER := 10 PGVER := 10
repo := $(CHROOT)/$(APP_ROOT)
etc_issue := $(CHROOT)/etc/issue
services := $(wildcard *.service)
service_targets := $(patsubst %,$(CHROOT)/etc/systemd/system/%,$(services))
$(CHROOT)/etc/systemd/system/%.service: %.service
cp $< $@
RUN systemctl enable $<
$(etc_issue): issue
cp $< $@
$(repo):
hg clone -u $(AIRPORT_BRANCH) $(AIRPORT_REPO) $@
preinstall: preinstall:
postinstall: settings.py issue nginx.conf $(service_targets) $(repo) $(etc_issue)
postinstall: airport.service settings.py issue nginx.conf airport-pre.service airport-gameserver.service airport-wsgi.service
RUN eselect postgresql set $(PGVER) RUN eselect postgresql set $(PGVER)
rm -rf $(CHROOT)/var/lib/postgresql/$(PGVER) rm -rf $(CHROOT)/var/lib/postgresql/$(PGVER)
RUN bash -c "echo y |$(EMERGE) --config postgresql:$(PGVER)" RUN bash -c "echo y |$(EMERGE) --config postgresql:$(PGVER)"
@ -15,8 +28,8 @@ postinstall: airport.service settings.py issue nginx.conf airport-pre.service ai
rm -rf $(CHROOT)/$(APP_ROOT) rm -rf $(CHROOT)/$(APP_ROOT)
hg clone -u $(AIRPORT_BRANCH) $(AIRPORT_REPO) $(CHROOT)/$(APP_ROOT) hg clone -u $(AIRPORT_BRANCH) $(AIRPORT_REPO) $(CHROOT)/$(APP_ROOT)
chroot $(CHROOT) virtualenv -p /usr/bin/python3 $(APP_ROOT) chroot $(CHROOT) virtualenv -p /usr/bin/python3 $(APP_ROOT)
RUN bash -c ". $(APP_ROOT)/bin/activate ; pip install -r $(APP_ROOT)/requirements.txt" RUN $(APP_ROOT)/bin/pip install -r $(APP_ROOT)/requirements.txt
RUN bash -c ". $(APP_ROOT)/bin/activate ; pip install psycopg2 uwsgi" RUN $(APP_ROOT)/bin/pip install psycopg2 uwsgi
COPY settings.py /$(APP_ROOT)/djangoproject/djangoproject COPY settings.py /$(APP_ROOT)/djangoproject/djangoproject
RUN id -u airport >/dev/null || RUN useradd -d $(APP_ROOT) -M -U -G postgres airport RUN id -u airport >/dev/null || RUN useradd -d $(APP_ROOT) -M -U -G postgres airport
RUN chown -R airport:airport $(APP_ROOT) RUN chown -R airport:airport $(APP_ROOT)
@ -25,20 +38,10 @@ ifdef AIRPORT_SERIES
RUN cp /$(APP_ROOT)/djangoproject/airport/fixtures/$(AIRPORT_SERIES).json \ RUN cp /$(APP_ROOT)/djangoproject/airport/fixtures/$(AIRPORT_SERIES).json \
/$(APP_ROOT)/djangoproject/airport/fixtures/initial_data.json /$(APP_ROOT)/djangoproject/airport/fixtures/initial_data.json
endif endif
COPY issue /etc/issue
COPY -u airport-pre.service /etc/systemd/system/airport-pre.service
COPY -u airport-wsgi.service /etc/systemd/system/airport-wsgi.service
COPY -u airport-gameserver.service /etc/systemd/system/airport-gameserver.service
$(M4) -D HOSTNAME=$(HOSTNAME) nginx.conf > $(CHROOT)/etc/nginx/nginx.conf $(M4) -D HOSTNAME=$(HOSTNAME) nginx.conf > $(CHROOT)/etc/nginx/nginx.conf
RUN gpasswd -a nginx airport RUN gpasswd -a nginx airport
RUN systemctl enable airport-wsgi.service RUN systemctl enable airport-wsgi.service
RUN systemctl enable airport-gameserver.service RUN systemctl enable airport-gameserver.service
ifeq ($(AVAHI),YES)
RUN $(EMERGE) --noreplace $(USEPKG) net-dns/avahi
RUN rm -f /etc/avahi/services/*
COPY airport.service /etc/avahi/services
RUN systemctl enable avahi-daemon
endif
RUN $(EMERGE) --depclean --with-bdeps=n RUN $(EMERGE) --depclean --with-bdeps=n

7
appliances/airport/airport.service
View File

@ -1,7 +0,0 @@
<service-group>
<name>Airport</name>
<service>
<type>_http._tcp</type>
<port>80</port>
</service>
</service-group>

1
appliances/airport/make.conf
View File

@ -2,3 +2,4 @@
PYTHON_TARGETS="python3_6" PYTHON_TARGETS="python3_6"
USE_PYTHON="3.6" USE_PYTHON="3.6"
NGINX_MODULES_HTTP="auth_basic gzip proxy referer rewrite headers_more uwsgi" NGINX_MODULES_HTTP="auth_basic gzip proxy referer rewrite headers_more uwsgi"
INSTALL_MASK="$INSTALL_MASK /etc/nginx/nginx.conf /etc/issue"