Skip to content

Commit

Permalink
Update Configure MAMP for DerbyNet app to activate socache_shmcb_modu…
Browse files Browse the repository at this point in the history 
…le and slotmem_shm_module.

Add a warning in "Installation- Mac" document to direct user to use Docker if MAMP won't launch.
  • Loading branch information
@jeffpiazza
jeffpiazza committed Oct 8, 2024
1 parent d6d2f6b commit 447d92e
Show file tree
Hide file tree
Showing 7 changed files with 264 additions and 199 deletions.
370 changes: 210 additions & 160 deletions docs/Installation- Mac.fodt
View file

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions installer/mac/webserver/Configure MAMP for DerbyNet.app/Contents/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>AMStayOpen</key>
<false/>
<key>BuildMachineOSBuild</key>
<string>20A241133</string>
<string>22A380019</string>
<key>CFBundleAllowMixedLocalizations</key>
<true/>
<key>CFBundleDevelopmentRegion</key>
Expand Down Expand Up @@ -52,23 +52,23 @@
<key>CFBundleURLTypes</key>
<array/>
<key>CFBundleVersion</key>
<string>520</string>
<string>523</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>14A6270d</string>
<string></string>
<key>DTPlatformName</key>
<string>macosx</string>
<key>DTPlatformVersion</key>
<string>13.1</string>
<string>14.4</string>
<key>DTSDKBuild</key>
<string>22C48</string>
<string>23E200</string>
<key>DTSDKName</key>
<string>macosx13.1.internal</string>
<string>macosx14.4.internal</string>
<key>DTXcode</key>
<string>1400</string>
<string>1500</string>
<key>DTXcodeBuild</key>
<string>14A6270d</string>
<string>15E6079e</string>
<key>LSMinimumSystemVersion</key>
<string>10.9</string>
<key>LSUIElement</key>
Expand Down
Binary file modified ...r/mac/webserver/Configure MAMP for DerbyNet.app/Contents/MacOS/Automator Application Stub
View file
Binary file not shown.
Binary file modified installer/mac/webserver/Configure MAMP for DerbyNet.app/Contents/Resources/Assets.car
View file
Binary file not shown.
Binary file modified ...aller/mac/webserver/Configure MAMP for DerbyNet.app/Contents/Resources/InfoPlist.loctable
View file
Binary file not shown.
16 changes: 8 additions & 8 deletions ...aller/mac/webserver/Configure MAMP for DerbyNet.app/Contents/_CodeSignature/CodeResources
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
</data>
<key>Resources/Assets.car</key>
<data>
+EyHXsSpe2QgUC474KHf/eJJOCo=
2w3tVqOo5nzPcvzUkUuSnGwYA2A=
</data>
<key>Resources/InfoPlist.loctable</key>
<data>
GFHRfFTmEbAuZE1iyKibKmkU2+0=
71fUaDHmKoEjKlKkMLLNl4Pivgg=
</data>
</dict>
<key>files2</key>
Expand All @@ -34,32 +34,32 @@
<dict>
<key>hash</key>
<data>
+EyHXsSpe2QgUC474KHf/eJJOCo=
2w3tVqOo5nzPcvzUkUuSnGwYA2A=
</data>
<key>hash2</key>
<data>
dsrJNb9XLiM6FpWXiJbLeUQWQeP3OK8zhQP9vrXz74c=
/KAt2FTS4OhX8ow5H1P4iYTpc+Ro+KDnYwfAYG6uvrA=
</data>
</dict>
<key>Resources/InfoPlist.loctable</key>
<dict>
<key>hash</key>
<data>
GFHRfFTmEbAuZE1iyKibKmkU2+0=
71fUaDHmKoEjKlKkMLLNl4Pivgg=
</data>
<key>hash2</key>
<data>
UOUbWh1OGuLBljFDZpqdwARDPWymLLRuoV5MvojegUE=
tyC+7QMvGJZKI4nDnLOsiKfB+pRASNJx8BuCkMwIJj4=
</data>
</dict>
<key>document.wflow</key>
<dict>
<key>cdhash</key>
<data>
FVRu5Mc2TIza+isZc0zEQPBJ+nM=
Zz3pOyrXQ8oa5MebFYzTaIrrf5Y=
</data>
<key>requirement</key>
<string>cdhash H"682db6e23bb3a22c1a5914b93f4755beeb569f1c" or cdhash H"15546ee4c7364c8cdafa2b19734cc440f049fa73"</string>
<string>cdhash H"86c5f42a882e27457fd68eeae4858404d58e0eaa" or cdhash H"673de93b2ad743ca1ae4c79b158cd3688aeb7f96"</string>
</dict>
</dict>
<key>rules</key>
Expand Down
61 changes: 38 additions & 23 deletions installer/mac/webserver/Configure MAMP for DerbyNet.app/Contents/document.wflow
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>AMApplicationBuild</key>
<string>520</string>
<string>523</string>
<key>AMApplicationVersion</key>
<string>2.10</string>
<key>AMDocumentVersion</key>
Expand Down Expand Up @@ -84,10 +84,8 @@
</array>
<key>Class Name</key>
<string>AMAskForConfirmationAction</string>
<key>IgnoresInput</key>
<true/>
<key>InputUUID</key>
<string>B23B40AA-9336-4ACC-B417-664198F7361C</string>
<string>9199108E-A051-4931-AD83-94100308AC55</string>
<key>Keywords</key>
<array>
<string>Message</string>
Expand All @@ -97,9 +95,9 @@
<string>Show</string>
</array>
<key>OutputUUID</key>
<string>F9F6A61C-265B-4967-BFD5-29FB89BB4E65</string>
<string>EFC68AD8-2FBF-47D8-9AA3-2466DE2CCEDB</string>
<key>UUID</key>
<string>D274C014-1D4B-4757-9006-A58D750ED6C8</string>
<string>8112ABB8-43C7-4EBB-9D3E-A4A15F6CB061</string>
<key>UnlocalizedApplications</key>
<array>
<string>Automator</string>
Expand Down Expand Up @@ -172,6 +170,8 @@
<string>4</string>
</dict>
</dict>
<key>conversionLabel</key>
<integer>0</integer>
<key>isViewVisible</key>
<integer>1</integer>
<key>location</key>
Expand Down Expand Up @@ -236,6 +236,8 @@ APACHE_CONF_DIR=/Applications/MAMP/conf/apache
HTTPD_CONF=$APACHE_CONF_DIR/httpd.conf
HTTPD_SSL_CONF=$APACHE_CONF_DIR/extra/httpd-ssl.conf

# Foo

sed -i \
-e "s!^ *Listen *8888!Listen 80!" \
$HTTPD_CONF
Expand Down Expand Up @@ -264,6 +266,16 @@ sed -i \
SetEnv DERBYNET_CONFIG_DIR /Library/WebServer/Documents/derbynet/local\\
" $HTTPD_CONF

grep -s DERBYNET_CONFIG_DIR $HTTPD_CONF || \
sed -i \
-e 's!# *\(LoadModule *socache_shmcb_module .*\)!\1!'" \
$HTTPD_CONF

grep -s DERBYNET_CONFIG_DIR $HTTPD_CONF || \
sed -i \
-e 's!# *\(LoadModule *slotmem_shm_module .*\)!\1!'" \
$HTTPD_CONF


######### SSL

Expand Down Expand Up @@ -292,7 +304,8 @@ sed -i \
# It may left over from some earlier versions of MAMP.
sed -i \
-e "s!^SSLMutex!#SSLMutex!" \
$HTTPD_SSL_CONF</string>
$HTTPD_SSL_CONF
</string>
<key>CheckedForUserDefaultShell</key>
<true/>
<key>inputMethod</key>
Expand All @@ -316,10 +329,8 @@ sed -i \
</array>
<key>Class Name</key>
<string>RunShellScriptAction</string>
<key>IgnoresInput</key>
<true/>
<key>InputUUID</key>
<string>9B7E85F1-D9B3-47CE-BF47-A881115F0484</string>
<string>6BD01A5A-0DA5-4972-8EFB-661172478E1D</string>
<key>Keywords</key>
<array>
<string>Shell</string>
Expand All @@ -329,9 +340,9 @@ sed -i \
<string>Unix</string>
</array>
<key>OutputUUID</key>
<string>48C6850F-BF94-4E50-8094-D337D58B698B</string>
<string>22127BE3-278E-48C3-9E5D-77E4DE61D501</string>
<key>UUID</key>
<string>9DE540BE-535D-4331-A713-BED04B9670F1</string>
<string>607471A2-4D35-49F7-82D3-67ABEFFF3658</string>
<key>UnlocalizedApplications</key>
<array>
<string>Automator</string>
Expand Down Expand Up @@ -404,10 +415,12 @@ sed -i \
<string>4</string>
</dict>
</dict>
<key>conversionLabel</key>
<integer>0</integer>
<key>isViewVisible</key>
<integer>1</integer>
<key>location</key>
<string>431.000000:893.000000</string>
<string>431.000000:866.000000</string>
<key>nibPath</key>
<string>/System/Library/Automator/Run Shell Script.action/Contents/Resources/Base.lproj/main.nib</string>
</dict>
Expand Down Expand Up @@ -473,16 +486,16 @@ sed -i \
<key>Class Name</key>
<string>AMLaunchApplicationAction</string>
<key>InputUUID</key>
<string>0C1ACE11-4448-425B-ACF2-FAD14386E18A</string>
<string>AFFF37CF-F71E-4200-87C0-8B9B45E50DDD</string>
<key>Keywords</key>
<array>
<string>File</string>
<string>Open</string>
</array>
<key>OutputUUID</key>
<string>A26E9ADE-663F-4EAF-939B-5C519E88AC18</string>
<string>47355B04-737A-4C05-B6A6-BFCF762C99EC</string>
<key>UUID</key>
<string>45688468-6041-4721-B628-394AC326E4FD</string>
<string>8AC51432-19B5-4169-9757-124F86B5812D</string>
<key>UnlocalizedApplications</key>
<array>
<string>Finder</string>
Expand All @@ -503,10 +516,12 @@ sed -i \
<string>0</string>
</dict>
</dict>
<key>conversionLabel</key>
<integer>0</integer>
<key>isViewVisible</key>
<integer>1</integer>
<key>location</key>
<string>431.000000:993.000000</string>
<string>431.000000:966.000000</string>
<key>nibPath</key>
<string>/System/Library/Automator/Launch Application.action/Contents/Resources/Base.lproj/main.nib</string>
</dict>
Expand All @@ -516,19 +531,19 @@ sed -i \
</array>
<key>connectors</key>
<dict>
<key>19FD1D41-39B9-4EEA-BDB3-9170BB409FCB</key>
<key>10060B32-49FE-440C-B5B8-58BC914C48A1</key>
<dict>
<key>from</key>
<string>D274C014-1D4B-4757-9006-A58D750ED6C8 - D274C014-1D4B-4757-9006-A58D750ED6C8</string>
<string>607471A2-4D35-49F7-82D3-67ABEFFF3658 - 607471A2-4D35-49F7-82D3-67ABEFFF3658</string>
<key>to</key>
<string>9DE540BE-535D-4331-A713-BED04B9670F1 - 9DE540BE-535D-4331-A713-BED04B9670F1</string>
<string>8AC51432-19B5-4169-9757-124F86B5812D - 8AC51432-19B5-4169-9757-124F86B5812D</string>
</dict>
<key>C9E87984-CCEB-460A-AE34-B7A9E55C3BFD</key>
<key>91E61877-D47E-47A7-9D07-C39C54D46FE6</key>
<dict>
<key>from</key>
<string>9DE540BE-535D-4331-A713-BED04B9670F1 - 9DE540BE-535D-4331-A713-BED04B9670F1</string>
<string>8112ABB8-43C7-4EBB-9D3E-A4A15F6CB061 - 8112ABB8-43C7-4EBB-9D3E-A4A15F6CB061</string>
<key>to</key>
<string>45688468-6041-4721-B628-394AC326E4FD - 45688468-6041-4721-B628-394AC326E4FD</string>
<string>607471A2-4D35-49F7-82D3-67ABEFFF3658 - 607471A2-4D35-49F7-82D3-67ABEFFF3658</string>
</dict>
</dict>
<key>workflowMetaData</key>
Expand Down

0 comments on commit 447d92e

Please sign in to comment.