@@ -59,6 +59,7 @@ make %{?_smp_mflags}

 make DESTDIR=%{buildroot} install

 install -vdm755 %{buildroot}/usr/lib/systemd/system

+install -vdm755 %{buildroot}/etc/httpd/logs

 cat << EOF >> %{buildroot}/usr/lib/systemd/system/httpd.service

 [Unit]

@@ -68,8 +69,8 @@ After=network.target remote-fs.target nss-lookup.target

 [Service]

 Type=notify

-ExecStart=/usr/sbin/httpd $OPTIONS -DFOREGROUND

-ExecReload=/usr/sbin/httpd $OPTIONS -k graceful

+ExecStart=/usr/sbin/httpd \$OPTIONS -DFOREGROUND

+ExecReload=/usr/sbin/httpd \$OPTIONS -k graceful

 KillSignal=SIGWINCH

 KillMode=mixed

 Restart=always

@@ -118,6 +119,7 @@ fi

 %{_sysconfdir}/httpd/error/*

 %{_sysconfdir}/httpd/htdocs/*

 %{_sysconfdir}/httpd/icons/*

+%dir %{_sysconfdir}/httpd/logs

 %changelog

@@ -19,7 +19,8 @@ BuildRequires:   python2-libs

 BuildRequires:   python2-devel

 BuildRequires:   python2-tools

 BuildRequires:   glib-networking

-Requires:	libxml2

+Requires:        libxml2

+Requires:        glib-networking

 %description

 libsoup is HTTP client/server library for GNOME

@@ -1,27 +1,17 @@

-{

-    "packages":["glibc", "zlib", "filesystem",

-                "libgcc", "libstdc++", 

-                "sed", "bzip2", "pkg-config", "readline", "ncurses", "bash",

-                "cracklib", "cracklib-dicts", "cracklib-python", "shadow", 

-                "coreutils", "grep",

-                "findutils", "tar",

-                "xz", "grub2", "kmod", "grub2-efi",

-                "util-linux", "e2fsprogs",

-                "expat",

-                "linux", "cpio",

-                "Linux-PAM", "attr", "libcap", "systemd", "dbus",

-                "elfutils-libelf", "sqlite-autoconf", "nspr", "nss", "popt", "lua", "rpm",

-                "gptfdisk", "gzip", "openssl", "python2", "python2-libs", "python-requests",

-                "pcre",

-                "libgsystem", "ostree","device-mapper","device-mapper-libs","libsepol","libselinux", 

-                "db", "libsolv",

-                "dracut", "dracut-tools",

-                "gpgme", "gpgme-devel", "hawkey", "python-hawkey", "json-glib", "glib",

-                "libarchive", "libarchive-devel", "libassuan", "libffi",

-                "libgpg-error", "libhif", "libhif-devel",

-                "librepo", "librepo-devel", "libsoup", "libsoup-devel",

-                "libxml2", "mkinitcpio", "openssl-devel",

-                "yum", "libtasn1", "nettle", "nettle-devel", "gnutls",

-                "gnutls-devel", "glib-networking", "ostree", "gmp",

-                "dosfstools", "pciutils", "efivar", "efibootmgr"]

+{   

+    "packages": ["gc", "gmp", "libgcc", "libunistring", "libltdl", "libstdc++", "libffi",

+            "xz", "attr", "openssl", "pcre", "guile", "ca-certificates",

+            "kmod", "glib", "autogen", "libtasn1", "bzip2", "libcap", "Linux-PAM",

+            "nettle", "filesystem", "systemd", "gnutls", "python2", "glibc", "libgpg-error",

+            "bash", "libassuan", "gpgme", "libsolv", "util-linux", "glib-networking",

+            "openssl-devel", "libselinux", "libxml2", "expat", "curl", "coreutils",

+            "libsepol", "popt", "gobject-introspection", "rpm-devel", "db", "sqlite-autoconf",

+            "nspr", "libxml2-devel", "hawkey-devel", "lua", "libarchive", "nss", "rpm", "librepo",

+            "librepo-devel", "dracut", "cracklib", "ncurses", "zlib", "file", "elfutils-libelf",

+            "libsoup", "device-mapper-libs", "hawkey", "readline", "libsoup-devel", "device-mapper",

+            "mkinitcpio", "python2-libs", "dracut-tools", "libgsystem", "nettle-devel", "libhif",

+            "libtasn1-devel", "libarchive-devel", "cracklib-dicts", "findutils", "efivar", "grub2",

+            "cpio", "shadow", "dbus", "python-requests", "pkg-config", "dosfstools", "sed", "json-glib",

+            "python-hawkey", "libhif-devel", "grub2-efi", "linux", "cracklib-python", "gpgme-devel",

+            "grep", "ostree", "tar", "efibootmgr", "pciutils", "gnutls-devel", "e2fsprogs", "gzip", "gptfdisk"]

 }

@@ -1,9 +1,15 @@

 {

-    "packages":["filesystem", "glibc", "bash", "bzip2", "dracut", "dracut-tools",

-                "glib", "gpgme", "gpgme-devel", "hawkey", "json-glib",

-                "libarchive", "libarchive-devel", "libassuan", "libcap", "libffi",

-                "libgcc", "libgpg-error", "libgsystem", "libhif", "libhif-devel",

-                "librepo", "librepo-devel", "libsolv", "libsoup", "libsoup-devel",

-                "libxml2", "mkinitcpio", "openssl-devel", "ostree", "pcre", "rpm",

-                "sqlite-autoconf", "systemd", "xz", "yum", "zlib", "ostree", "rpm-ostree"]

+    "packages": ["gc", "libunistring", "libffi", "libltdl", "gmp", "guile", "openssl",

+                 "autogen", "ncurses", "ca-certificates", "libtasn1", "e2fsprogs", "nettle",

+                 "bzip2", "e2fsprogs-devel", "xz", "readline", "glibc", "sqlite-autoconf",

+                 "bash", "python2", "nspr", "gnutls", "filesystem", "libgcc", "krb5",

+                 "libassuan", "libxml2", "expat", "gdbm", "openssl-devel", "popt", "curl",

+                 "nss", "gpgme", "systemd", "libsolv", "coreutils", "lua", "libgpg-error",

+                 "elfutils-libelf", "libcap", "glib", "glib-networking", "file", "Linux-PAM",

+                 "kmod", "util-linux", "libstdc++", "attr", "zlib", "rpm", "pcre", "perl",

+                 "cyrus-sasl", "libsoup", "db", "hawkey", "librepo", "dracut", "libxml2-devel",

+                 "libarchive", "apr", "hawkey-devel", "gobject-introspection", "librepo-devel",

+                 "rpm-devel", "libarchive-devel", "libgsystem", "dracut-tools", "libsoup-devel",

+                 "mkinitcpio", "openldap", "postgresql", "libhif", "json-glib", "apr-util",

+                 "ostree", "httpd", "rpm-ostree"]

 }

new file mode 100644

@@ -0,0 +1,2 @@

+#!/bin/bash

+ifconfig | grep inet | grep -v "127.0.0.1" | grep -v inet6

new file mode 100644

@@ -0,0 +1,14 @@

+[Unit]

+Description=The Apache HTTP Server

+After=network.target remote-fs.target nss-lookup.target

+

+[Service]

+Type=forking

+ExecStart=/usr/sbin/httpd -f /srv/rpm-ostree/ostree-httpd.conf -DFORGROUND

+ExecReload=/usr/sbin/httpd -f /srv/rpm-ostree/ostree-httpd.conf -k graceful

+KillSignal=SIGWINCH

+KillMode=mixed

+Restart=always

+

+[Install]

+WantedBy=multi-user.target

new file mode 100644

@@ -0,0 +1,117 @@

+ServerName 127.0.0.1

+Listen 80

+

+DocumentRoot /srv/rpm-ostree/repo

+

+<Directory "/srv/rpm-ostree/repo">

+   Options All Indexes FollowSymLinks

+   Order allow,deny

+   Allow from all

+</Directory>

+

+LoadModule authn_file_module /usr/lib/httpd/modules/mod_authn_file.so

+#LoadModule authn_dbm_module /usr/lib/httpd/modules/mod_authn_dbm.so

+#LoadModule authn_anon_module /usr/lib/httpd/modules/mod_authn_anon.so

+#LoadModule authn_dbd_module /usr/lib/httpd/modules/mod_authn_dbd.so

+#LoadModule authn_socache_module /usr/lib/httpd/modules/mod_authn_socache.so

+LoadModule authn_core_module /usr/lib/httpd/modules/mod_authn_core.so

+LoadModule authz_host_module /usr/lib/httpd/modules/mod_authz_host.so

+LoadModule authz_groupfile_module /usr/lib/httpd/modules/mod_authz_groupfile.so

+LoadModule authz_user_module /usr/lib/httpd/modules/mod_authz_user.so

+#LoadModule authz_dbm_module /usr/lib/httpd/modules/mod_authz_dbm.so

+#LoadModule authz_owner_module /usr/lib/httpd/modules/mod_authz_owner.so

+#LoadModule authz_dbd_module /usr/lib/httpd/modules/mod_authz_dbd.so

+LoadModule authz_core_module /usr/lib/httpd/modules/mod_authz_core.so

+#LoadModule authnz_ldap_module /usr/lib/httpd/modules/mod_authnz_ldap.so

+#LoadModule authnz_fcgi_module /usr/lib/httpd/modules/mod_authnz_fcgi.so

+LoadModule access_compat_module /usr/lib/httpd/modules/mod_access_compat.so

+LoadModule auth_basic_module /usr/lib/httpd/modules/mod_auth_basic.so

+#LoadModule auth_form_module /usr/lib/httpd/modules/mod_auth_form.so

+#LoadModule auth_digest_module /usr/lib/httpd/modules/mod_auth_digest.so

+#LoadModule allowmethods_module /usr/lib/httpd/modules/mod_allowmethods.so

+#LoadModule file_cache_module /usr/lib/httpd/modules/mod_file_cache.so

+#LoadModule cache_module /usr/lib/httpd/modules/mod_cache.so

+#LoadModule cache_disk_module /usr/lib/httpd/modules/mod_cache_disk.so

+#LoadModule cache_socache_module /usr/lib/httpd/modules/mod_cache_socache.so

+#LoadModule socache_shmcb_module /usr/lib/httpd/modules/mod_socache_shmcb.so

+#LoadModule socache_dbm_module /usr/lib/httpd/modules/mod_socache_dbm.so

+#LoadModule socache_memcache_module /usr/lib/httpd/modules/mod_socache_memcache.so

+#LoadModule watchdog_module /usr/lib/httpd/modules/mod_watchdog.so

+#LoadModule macro_module /usr/lib/httpd/modules/mod_macro.so

+#LoadModule dbd_module /usr/lib/httpd/modules/mod_dbd.so

+#LoadModule dumpio_module /usr/lib/httpd/modules/mod_dumpio.so

+#LoadModule echo_module /usr/lib/httpd/modules/mod_echo.so

+#LoadModule buffer_module /usr/lib/httpd/modules/mod_buffer.so

+#LoadModule data_module /usr/lib/httpd/modules/mod_data.so

+#LoadModule ratelimit_module /usr/lib/httpd/modules/mod_ratelimit.so

+LoadModule reqtimeout_module /usr/lib/httpd/modules/mod_reqtimeout.so

+#LoadModule ext_filter_module /usr/lib/httpd/modules/mod_ext_filter.so

+#LoadModule request_module /usr/lib/httpd/modules/mod_request.so

+#LoadModule include_module /usr/lib/httpd/modules/mod_include.so

+LoadModule filter_module /usr/lib/httpd/modules/mod_filter.so

+#LoadModule reflector_module /usr/lib/httpd/modules/mod_reflector.so

+#LoadModule substitute_module /usr/lib/httpd/modules/mod_substitute.so

+#LoadModule sed_module /usr/lib/httpd/modules/mod_sed.so

+#LoadModule charset_lite_module /usr/lib/httpd/modules/mod_charset_lite.so

+#LoadModule deflate_module /usr/lib/httpd/modules/mod_deflate.so

+LoadModule mime_module /usr/lib/httpd/modules/mod_mime.so

+#LoadModule ldap_module /usr/lib/httpd/modules/mod_ldap.so

+LoadModule log_config_module /usr/lib/httpd/modules/mod_log_config.so

+#LoadModule log_debug_module /usr/lib/httpd/modules/mod_log_debug.so

+#LoadModule log_forensic_module /usr/lib/httpd/modules/mod_log_forensic.so

+#LoadModule logio_module /usr/lib/httpd/modules/mod_logio.so

+LoadModule env_module /usr/lib/httpd/modules/mod_env.so

+#LoadModule mime_magic_module /usr/lib/httpd/modules/mod_mime_magic.so

+#LoadModule expires_module /usr/lib/httpd/modules/mod_expires.so

+LoadModule headers_module /usr/lib/httpd/modules/mod_headers.so

+#LoadModule usertrack_module /usr/lib/httpd/modules/mod_usertrack.so

+#LoadModule unique_id_module /usr/lib/httpd/modules/mod_unique_id.so

+LoadModule setenvif_module /usr/lib/httpd/modules/mod_setenvif.so

+LoadModule version_module /usr/lib/httpd/modules/mod_version.so

+#LoadModule remoteip_module /usr/lib/httpd/modules/mod_remoteip.so

+#LoadModule proxy_module /usr/lib/httpd/modules/mod_proxy.so

+#LoadModule proxy_connect_module /usr/lib/httpd/modules/mod_proxy_connect.so

+#LoadModule proxy_ftp_module /usr/lib/httpd/modules/mod_proxy_ftp.so

+#LoadModule proxy_http_module /usr/lib/httpd/modules/mod_proxy_http.so

+#LoadModule proxy_fcgi_module /usr/lib/httpd/modules/mod_proxy_fcgi.so

+#LoadModule proxy_scgi_module /usr/lib/httpd/modules/mod_proxy_scgi.so

+#LoadModule proxy_fdpass_module /usr/lib/httpd/modules/mod_proxy_fdpass.so

+#LoadModule proxy_wstunnel_module /usr/lib/httpd/modules/mod_proxy_wstunnel.so

+#LoadModule proxy_ajp_module /usr/lib/httpd/modules/mod_proxy_ajp.so

+#LoadModule proxy_balancer_module /usr/lib/httpd/modules/mod_proxy_balancer.so

+#LoadModule proxy_express_module /usr/lib/httpd/modules/mod_proxy_express.so

+#LoadModule session_module /usr/lib/httpd/modules/mod_session.so

+#LoadModule session_cookie_module /usr/lib/httpd/modules/mod_session_cookie.so

+#LoadModule session_crypto_module /usr/lib/httpd/modules/mod_session_crypto.so

+#LoadModule session_dbd_module /usr/lib/httpd/modules/mod_session_dbd.so

+#LoadModule slotmem_shm_module /usr/lib/httpd/modules/mod_slotmem_shm.so

+#LoadModule slotmem_plain_module /usr/lib/httpd/modules/mod_slotmem_plain.so

+#LoadModule ssl_module /usr/lib/httpd/modules/mod_ssl.so

+#LoadModule dialup_module /usr/lib/httpd/modules/mod_dialup.so

+#LoadModule lbmethod_byrequests_module /usr/lib/httpd/modules/mod_lbmethod_byrequests.so

+#LoadModule lbmethod_bytraffic_module /usr/lib/httpd/modules/mod_lbmethod_bytraffic.so

+#LoadModule lbmethod_bybusyness_module /usr/lib/httpd/modules/mod_lbmethod_bybusyness.so

+#LoadModule lbmethod_heartbeat_module /usr/lib/httpd/modules/mod_lbmethod_heartbeat.so

+LoadModule mpm_event_module /usr/lib/httpd/modules/mod_mpm_event.so

+LoadModule unixd_module /usr/lib/httpd/modules/mod_unixd.so

+#LoadModule heartbeat_module /usr/lib/httpd/modules/mod_heartbeat.so

+#LoadModule heartmonitor_module /usr/lib/httpd/modules/mod_heartmonitor.so

+#LoadModule dav_module /usr/lib/httpd/modules/mod_dav.so

+LoadModule status_module /usr/lib/httpd/modules/mod_status.so

+LoadModule autoindex_module /usr/lib/httpd/modules/mod_autoindex.so

+#LoadModule asis_module /usr/lib/httpd/modules/mod_asis.so

+#LoadModule info_module /usr/lib/httpd/modules/mod_info.so

+#LoadModule cgid_module /usr/lib/httpd/modules/mod_cgid.so

+#LoadModule cgi_module /usr/lib/httpd/modules/mod_cgi.so

+#LoadModule dav_fs_module /usr/lib/httpd/modules/mod_dav_fs.so

+#LoadModule dav_lock_module /usr/lib/httpd/modules/mod_dav_lock.so

+#LoadModule vhost_alias_module /usr/lib/httpd/modules/mod_vhost_alias.so

+#LoadModule negotiation_module /usr/lib/httpd/modules/mod_negotiation.so

+LoadModule dir_module /usr/lib/httpd/modules/mod_dir.so

+#LoadModule actions_module /usr/lib/httpd/modules/mod_actions.so

+#LoadModule speling_module /usr/lib/httpd/modules/mod_speling.so

+#LoadModule userdir_module /usr/lib/httpd/modules/mod_userdir.so

+LoadModule alias_module /usr/lib/httpd/modules/mod_alias.so

+#LoadModule rewrite_module /usr/lib/httpd/modules/mod_rewrite.so

+

+

new file mode 100644

@@ -0,0 +1,10 @@

+Welcome to PhotonOS (TP2) RPM-OSTree Server

+\r \s \v

+

+RPM-OSTree repo is created at '/srv/rpm-ostree/repo'.

+A web server is automatically started to expose this repo for RPM-OSTree Host installations.

+Point your RPM-OSTree Host to 'http://<IP of this server>/' for pulling the repo.

+The default OSTree reference of this repo is 'tp2/x86_64/minimal'.

+

+=== Technical Preview. Do not use in production. ===

+

@@ -31,7 +31,6 @@ class OstreeInstaller(Installer):

     def __init__(self, install_config, maxy = 0, maxx = 0, iso_installer = False, rpm_path = "../stage/RPMS", log_path = "../stage/LOGS", ks_config = None):

         Installer.__init__(self, install_config, maxy, maxx, iso_installer, rpm_path, log_path, ks_config)

-    

         self.win_height = 13

         self.win_width = 50

         self.menu_starty = self.starty + 3    

@@ -36,6 +36,12 @@ class OstreeServerInstaller(Installer):

         self.run("mkdir -p {}/srv/rpm-ostree/repo".format(self.photon_root))

         self.run("cp ./photon-base.json {}/srv/rpm-ostree/".format(self.photon_root))

-        self.run("cp ./photon-ostree.repo {}/srv/rpm-ostree/".format(self.photon_root))

+        self.run("ln -s /etc/yum.repos.d/photon.repo {}/srv/rpm-ostree/photon-ostree.repo".format(self.photon_root))

+        self.run("cp ./ostree-httpd.conf {}/srv/rpm-ostree/".format(self.photon_root))

+        self.run("cp ./httpd.service {}/usr/lib/systemd/system/".format(self.photon_root))

+        self.run("cp ./get-ip-address.sh {}/usr/bin/".format(self.photon_root))

+        self.run("cp ./ostree-server-greeting.txt {}/etc/issue".format(self.photon_root))

+        self.run("ln -s /usr/lib/systemd/system/httpd.service {}/usr/lib/systemd/system/multi-user.target.wants/httpd.service".format(self.photon_root))

         self.run("tar -xf /mnt/cdrom/ostree-repo.tar.gz -C {}/srv/rpm-ostree/repo".format(self.photon_root))

+